Merge "bugfix: generate config file error"

10 files changed, 14 insertions, 9 deletions

diff --git a/deploy/adapters/ansible/roles/ceilometer_compute/tasks/main.yml b/deploy/adapters/ansible/roles/ceilometer_compute/tasks/main.yml
index 4fddd1e6..cb78acb6 100644
--- a/deploy/adapters/ansible/roles/ceilometer_compute/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/ceilometer_compute/tasks/main.yml
@@ -3,7 +3,7 @@
 
 - name: install ceilometer packages
   action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
-  with_items: "{{ ceilometer_packages }}| union(packages_noarch)"
+  with_items: ceilometer_packages | union(packages_noarch)
 
 - name: copy ceilometer configs
   template: src={{ item.src}} dest=/opt/os_templates
diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/tasks/main.yml b/deploy/adapters/ansible/roles/ceilometer_controller/tasks/main.yml
index 4fddd1e6..cb78acb6 100644
--- a/deploy/adapters/ansible/roles/ceilometer_controller/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/ceilometer_controller/tasks/main.yml
@@ -3,7 +3,7 @@
 
 - name: install ceilometer packages
   action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
-  with_items: "{{ ceilometer_packages }}| union(packages_noarch)"
+  with_items: ceilometer_packages | union(packages_noarch)
 
 - name: copy ceilometer configs
   template: src={{ item.src}} dest=/opt/os_templates
diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/vars/Debian.yml b/deploy/adapters/ansible/roles/ceilometer_controller/vars/Debian.yml
index 8317a3eb..9aeacfa7 100644
--- a/deploy/adapters/ansible/roles/ceilometer_controller/vars/Debian.yml
+++ b/deploy/adapters/ansible/roles/ceilometer_controller/vars/Debian.yml
@@ -18,9 +18,11 @@ ceilometer_services:
 
 ceilometer_configs_templates:
   - src: ceilometer.j2
-    dest: /etc/ceilometer/ceilometer.conf
+    dest:
+      - /etc/ceilometer/ceilometer.conf
   - src: cinder.j2
-    dest: /etc/cinder/cinder.conf
+    dest:
+      - /etc/cinder/cinder.conf
   - src: glance.j2
     dest:
       - /etc/glance/glance-api.conf
diff --git a/deploy/adapters/ansible/roles/cinder-controller/tasks/cinder_config.yml b/deploy/adapters/ansible/roles/cinder-controller/tasks/cinder_config.yml
index 5bce443c..69850846 100644
--- a/deploy/adapters/ansible/roles/cinder-controller/tasks/cinder_config.yml
+++ b/deploy/adapters/ansible/roles/cinder-controller/tasks/cinder_config.yml
@@ -6,5 +6,3 @@
   cinder_manage: action=dbsync
   notify:
     - restart cinder control serveice
-
-- meta: flush_handlers
diff --git a/deploy/adapters/ansible/roles/cinder-controller/tasks/cinder_install.yml b/deploy/adapters/ansible/roles/cinder-controller/tasks/cinder_install.yml
index 24981e9c..686ce1f5 100644
--- a/deploy/adapters/ansible/roles/cinder-controller/tasks/cinder_install.yml
+++ b/deploy/adapters/ansible/roles/cinder-controller/tasks/cinder_install.yml
@@ -7,3 +7,7 @@
   shell: echo {{ item }} >> /opt/service
   with_items: services | union(services_noarch)
 
+- name: upload cinder conf
+  template: src=cinder.conf dest=/etc/cinder/cinder.conf
+  notify:
+    - restart cinder control serveice
diff --git a/deploy/adapters/ansible/roles/cinder-controller/tasks/main.yml b/deploy/adapters/ansible/roles/cinder-controller/tasks/main.yml
index e6a5f04f..5491dcf0 100644
--- a/deploy/adapters/ansible/roles/cinder-controller/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/cinder-controller/tasks/main.yml
@@ -8,6 +8,7 @@
     - cinder
 
 - include: cinder_config.yml
+  when: inventory_hostname == groups['controller'][0]
   tags:
     - config
     - cinder-config
diff --git a/deploy/adapters/ansible/roles/glance/tasks/main.yml b/deploy/adapters/ansible/roles/glance/tasks/main.yml
index 7cbcfa96..f5ec3c79 100644
--- a/deploy/adapters/ansible/roles/glance/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/glance/tasks/main.yml
@@ -12,7 +12,7 @@
     - nfs
 
 - include: glance_config.yml
-  run_once: True
+  when: inventory_hostname == groups['controller'][0]
   tags:
     - config
     - glance_config
diff --git a/deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml b/deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml
index 5b3640d7..5825c5fe 100644
--- a/deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml
@@ -6,6 +6,7 @@
     - neutron
 
 - include: neutron_config.yml
+  when: inventory_hostname == groups['controller'][0]
   tags:
     - config
     - neutron_config
diff --git a/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml b/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml
index 26758f58..3912752b 100644
--- a/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml
+++ b/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml
@@ -11,10 +11,8 @@
 
 - name: restart first neutron-server
   service: name=neutron-server state=restarted enabled=yes
-  when: inventory_hostname == groups['controller'][0]
 
 - name: restart other neutron-server
   service: name=neutron-server state=restarted enabled=yes
-  when: inventory_hostname != groups['controller'][0]
 
 - meta: flush_handlers
diff --git a/deploy/adapters/ansible/roles/nova-controller/tasks/main.yml b/deploy/adapters/ansible/roles/nova-controller/tasks/main.yml
index de2563d7..da820c35 100644
--- a/deploy/adapters/ansible/roles/nova-controller/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/nova-controller/tasks/main.yml
@@ -6,6 +6,7 @@
     - nova
 
 - include: nova_config.yml
+  when: inventory_hostname == groups['controller'][0]
   tags:
     - config
     - nova_config