diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-21 09:41:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-21 09:41:03 +0000 |
| commit | 1fd6f79c8a69fc804bbc5eecd34c45924cb1969b (patch) | |
| tree | ad86a6b1421d1e3f1bed3f1da8786d3bdd79fa1d | |
| parent | da61508db8eb2c54ef7e9198d848667d288dfc13 (diff) | |
| parent | b6936383da7d78692a11830bf655b893eef63da9 (diff) | |
| download | kolla-1fd6f79c8a69fc804bbc5eecd34c45924cb1969b.tar.gz kolla-1fd6f79c8a69fc804bbc5eecd34c45924cb1969b.zip | |
Merge "Configurable policy.json for keystone"
| -rw-r--r-- | ansible/roles/keystone/tasks/config.yml | 11 | ||||
| -rw-r--r-- | ansible/roles/keystone/templates/keystone.json.j2 | 7 |
2 files changed, 18 insertions, 0 deletions
diff --git a/ansible/roles/keystone/tasks/config.yml b/ansible/roles/keystone/tasks/config.yml index e64a8d7df..12c3f47eb 100644 --- a/ansible/roles/keystone/tasks/config.yml +++ b/ansible/roles/keystone/tasks/config.yml @@ -1,4 +1,8 @@ --- +- name: Check if Policies shall be overwritten + local_action: stat path="{{ node_custom_config }}/keystone/policy.json" + register: keystone_policy + - name: Check if Keystone Domain specific settings enabled local_action: stat path="{{ node_custom_config }}/keystone/domains" register: keystone_domain_cfg @@ -49,6 +53,13 @@ with_fileglob: - "{{ node_custom_config }}/keystone/domains/*" +- name: Copying over existing policy.json + template: + src: "{{ node_custom_config }}/keystone/policy.json" + dest: "{{ node_config_directory }}/keystone/policy.json" + when: + keystone_policy.stat.exists + - name: Copying over wsgi-keystone.conf template: src: "wsgi-keystone.conf.j2" diff --git a/ansible/roles/keystone/templates/keystone.json.j2 b/ansible/roles/keystone/templates/keystone.json.j2 index 21cc9559e..acd507ff8 100644 --- a/ansible/roles/keystone/templates/keystone.json.j2 +++ b/ansible/roles/keystone/templates/keystone.json.j2 @@ -17,6 +17,13 @@ "optional": true }, { + "source": "{{ container_config_directory }}/policy.json", + "dest": "/etc/keystone/policy.json", + "owner": "keystone", + "perm": "0600", + "optional": true + }, + { "source": "{{ container_config_directory }}/wsgi-keystone.conf", "dest": "/etc/{{ keystone_dir }}/wsgi-keystone.conf", "owner": "keystone", |