summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/cinder-controller
diff options
context:
space:
mode:
authorcarey.xu <carey.xuhan@huawei.com>2015-10-13 23:49:44 +0800
committercarey.xu <carey.xuhan@huawei.com>2015-10-13 23:49:44 +0800
commita682e18d16a7e8862bd0e10882cbe1f197973d3b (patch)
tree38d55e28f6b0ca4108326050d5533b0084874f7e /deploy/adapters/ansible/roles/cinder-controller
parentcb004d80668a6bf63e208e81bf3c4fa86d889dcf (diff)
bugfix: generate config file error
JIRA: COMPASS-95 Change-Id: I223e8afbb909be72937f159d766817803b3c2ab6 Signed-off-by: carey.xu <carey.xuhan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/cinder-controller')
-rw-r--r--deploy/adapters/ansible/roles/cinder-controller/tasks/cinder_config.yml2
-rw-r--r--deploy/adapters/ansible/roles/cinder-controller/tasks/cinder_install.yml4
-rw-r--r--deploy/adapters/ansible/roles/cinder-controller/tasks/main.yml1
3 files changed, 5 insertions, 2 deletions
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