diff options
| author |   Justin chi <chigang@huawei.com> | 2015-10-15 01:41:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-10-15 01:41:48 +0000 |
| commit | 76344ea62126a46ab6fcc2c729b52575ecfc24a4 (patch) | |
| tree | d78597dafc6032f8b652d9762ac9df69d7fda144 /deploy/adapters/ansible/roles/cinder-controller | |
| parent | 252206f17671d3383a9f5dfe06e6f4ee13b00e90 (diff) | |
| parent | a682e18d16a7e8862bd0e10882cbe1f197973d3b (diff) | |
Merge "bugfix: generate config file error"
Diffstat (limited to 'deploy/adapters/ansible/roles/cinder-controller')
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 |