aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-20 12:26:37 +0000
committerGerrit Code Review <review@openstack.org>2016-09-20 12:26:37 +0000
commitaa378bfa3ab4aa04a2042ea313ec667c1e6541f6 (patch)
treec9de3c20cbdd06f136aa16df4690e98b09c2c5e5
parenta5527505c8b277f387536d868e1dbddef4623df7 (diff)
parentc3f2be5928d66060a52d8a3a5b2f5727494fdb80 (diff)
downloadkolla-aa378bfa3ab4aa04a2042ea313ec667c1e6541f6.tar.gz
kolla-aa378bfa3ab4aa04a2042ea313ec667c1e6541f6.zip
Merge "fix horizon fernet container"
-rw-r--r--ansible/roles/keystone/templates/keystone-fernet.json.j28
1 files changed, 7 insertions, 1 deletions
diff --git a/ansible/roles/keystone/templates/keystone-fernet.json.j2 b/ansible/roles/keystone/templates/keystone-fernet.json.j2
index 3066d2ef6..b74f01715 100644
--- a/ansible/roles/keystone/templates/keystone-fernet.json.j2
+++ b/ansible/roles/keystone/templates/keystone-fernet.json.j2
@@ -2,6 +2,12 @@
{
"command": "{{ cron_cmd }}",
"config_files": [{
+ "source": "{{ container_config_directory }}/keystone.conf",
+ "dest": "/etc/keystone/keystone.conf",
+ "owner": "keystone",
+ "perm": "0600"
+ },
+ {
"source": "{{ container_config_directory }}/crontab",
"dest": "/var/spool/cron/crontabs/root/fernet-cron",
"owner": "root",
@@ -20,4 +26,4 @@
"perm": "0755"
}
]
-} \ No newline at end of file
+}