aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ansible/roles/glance/tasks/config.yml20
1 files changed, 3 insertions, 17 deletions
diff --git a/ansible/roles/glance/tasks/config.yml b/ansible/roles/glance/tasks/config.yml
index dccee18d3..ed8cb57b0 100644
--- a/ansible/roles/glance/tasks/config.yml
+++ b/ansible/roles/glance/tasks/config.yml
@@ -16,32 +16,18 @@
- "glance-api"
- "glance-registry"
-- name: Copying over glance-api.conf
+- name: Copying over glance-*.conf
merge_configs:
vars:
service_name: "{{ item }}"
sources:
- - "{{ role_path }}/templates/glance-api.conf.j2"
+ - "{{ role_path }}/templates/{{ item }}.conf.j2"
- "/etc/kolla/config/global.conf"
- "/etc/kolla/config/database.conf"
- "/etc/kolla/config/messaging.conf"
- "/etc/kolla/config/glance.conf"
- "/etc/kolla/config/glance/{{ item }}.conf"
- dest: "{{ node_config_directory }}/{{ item }}/glance-api.conf"
+ dest: "{{ node_config_directory }}/{{ item }}/{{ item }}.conf"
with_items:
- "glance-api"
-
-- name: Copying over glance-registry.conf
- merge_configs:
- vars:
- service_name: "{{ item }}"
- sources:
- - "{{ role_path }}/templates/glance-registry.conf.j2"
- - "/etc/kolla/config/global.conf"
- - "/etc/kolla/config/database.conf"
- - "/etc/kolla/config/messaging.conf"
- - "/etc/kolla/config/glance.conf"
- - "/etc/kolla/config/glance/{{ item }}.conf"
- dest: "{{ node_config_directory }}/{{ item }}/glance-registry.conf"
- with_items:
- "glance-registry"