From ff91d53c7634a6580f5bc67797fbb4f0a8c8d2ac Mon Sep 17 00:00:00 2001
From: SamYaple <sam@yaple.net>
Date: Thu, 17 Mar 2016 17:17:12 +0000
Subject: [PATCH] Refactor glance config tasks
This now matches the way we copy confis in other services.
TrivialFix
Change-Id: Ia9c6d5f9a633c0b20b4d9a697863bd2753d39443
---
ansible/roles/glance/tasks/config.yml | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/ansible/roles/glance/tasks/config.yml b/ansible/roles/glance/tasks/config.yml
index dccee18d39..ed8cb57b07 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"
--
GitLab