diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-23 19:30:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-23 19:30:34 +0000 |
| commit | 274d808ff9a82ba19a18b6409f1d8ee57deadc88 (patch) | |
| tree | aead2006d1900e7bc7b00a4b4b515be88cb71b52 /ansible | |
| parent | 6e94b97dd6f0f1639c2efd167bcd028658568553 (diff) | |
| parent | 180e8c3331fc9e839739512a92bdc57b6244bd8e (diff) | |
| download | kolla-274d808ff9a82ba19a18b6409f1d8ee57deadc88.tar.gz kolla-274d808ff9a82ba19a18b6409f1d8ee57deadc88.zip | |
Merge "Replace config-external with a JSON file for Keystone"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/keystone/tasks/bootstrap.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/keystone/tasks/config.yml | 5 | ||||
| -rw-r--r-- | ansible/roles/keystone/tasks/start.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/keystone/templates/keystone.json.j2 | 19 |
4 files changed, 26 insertions, 2 deletions
diff --git a/ansible/roles/keystone/tasks/bootstrap.yml b/ansible/roles/keystone/tasks/bootstrap.yml index 34e0aba6e..61110f093 100644 --- a/ansible/roles/keystone/tasks/bootstrap.yml +++ b/ansible/roles/keystone/tasks/bootstrap.yml @@ -43,7 +43,7 @@ insecure_registry: "{{ docker_insecure_registry }}" name: bootstrap_keystone image: "{{ keystone_image_full }}" - volumes: "{{ node_config_directory }}/keystone/:/opt/kolla/keystone/:ro" + volumes: "{{ node_config_directory }}/keystone/:/opt/kolla/config_files/:ro" env: KOLLA_BOOTSTRAP: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" diff --git a/ansible/roles/keystone/tasks/config.yml b/ansible/roles/keystone/tasks/config.yml index ef832f7e4..f88023612 100644 --- a/ansible/roles/keystone/tasks/config.yml +++ b/ansible/roles/keystone/tasks/config.yml @@ -16,6 +16,11 @@ - "{{ node_templates_directory }}/keystone/keystone.conf_augment" config_dest: "{{ node_config_directory }}/keystone/keystone.conf" +- name: Copying over Keystone JSON configuration file + template: + src: "roles/keystone/templates/keystone.json.j2" + dest: "{{ node_config_directory }}/keystone/config.json" + - name: Copying over config(s) template: src: "wsgi-keystone.conf.j2" diff --git a/ansible/roles/keystone/tasks/start.yml b/ansible/roles/keystone/tasks/start.yml index 064e98783..3833ef9ad 100644 --- a/ansible/roles/keystone/tasks/start.yml +++ b/ansible/roles/keystone/tasks/start.yml @@ -13,6 +13,6 @@ insecure_registry: "{{ docker_insecure_registry }}" name: keystone image: "{{ keystone_image_full }}" - volumes: "{{ node_config_directory }}/keystone/:/opt/kolla/keystone/:ro" + volumes: "{{ node_config_directory }}/keystone/:/opt/kolla/config_files/:ro" env: KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" diff --git a/ansible/roles/keystone/templates/keystone.json.j2 b/ansible/roles/keystone/templates/keystone.json.j2 new file mode 100644 index 000000000..d5d85fd15 --- /dev/null +++ b/ansible/roles/keystone/templates/keystone.json.j2 @@ -0,0 +1,19 @@ +{% set keystone_cmd = 'apache2' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd' %} +{% set keystone_dir = 'apache2/conf-enabled' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd/conf.d' %} +{ + "command": "/usr/sbin/{{ keystone_cmd }}", + "config_files": [ + { + "source": "/opt/kolla/config_files/keystone.conf", + "dest": "/etc/keystone/keystone.conf", + "owner": "keystone", + "perm": "0600" + }, + { + "source": "/opt/kolla/config_files/wsgi-keystone.conf", + "dest": "/etc/{{ keystone_dir }}/wsgi-keystone.conf", + "owner": "keystone", + "perm": "0644" + } + ] +} |
