From 87612abc0e24cafd89a49e350165b08fe1608233 Mon Sep 17 00:00:00 2001 From: baigk Date: Thu, 6 Aug 2015 02:37:33 -0400 Subject: support deployment openstack juno with ansible for compass in centos7.1 JIRA: COMPASS-6 Change-Id: I8ef865e8acfe29c3ff5c7e9030e4cebabed3457b Signed-off-by: baigk --- .../roles/cinder-controller/tasks/cinder_config.yml | 6 ++++-- .../roles/cinder-controller/tasks/cinder_install.yml | 14 ++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) (limited to 'deploy/adapters/ansible/roles/cinder-controller/tasks') 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 7796cf77..fe9f7dc8 100644 --- a/deploy/adapters/ansible/roles/cinder-controller/tasks/cinder_config.yml +++ b/deploy/adapters/ansible/roles/cinder-controller/tasks/cinder_config.yml @@ -1,4 +1,7 @@ --- +- name: upload cinder conf + template: src=cinder.conf dest=/etc/cinder/cinder.conf + - name: sync cinder db shell: su -s /bin/sh -c "cinder-manage db sync" cinder && cinder register: result @@ -6,8 +9,7 @@ retries: 5 delay: 3 notify: - - restart cinder-scheduler - - restart cinder-api + - 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 bd4a4604..24981e9c 100644 --- a/deploy/adapters/ansible/roles/cinder-controller/tasks/cinder_install.yml +++ b/deploy/adapters/ansible/roles/cinder-controller/tasks/cinder_install.yml @@ -1,15 +1,9 @@ --- - name: install cinder packages - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes" - with_items: packages + action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" + with_items: packages | union(packages_noarch) -- name: generate cinder service list +- name: generate common cinder service list shell: echo {{ item }} >> /opt/service - with_items: services - -- name: upload cinder conf - template: src=cinder.conf dest=/etc/cinder/cinder.conf - notify: - - restart cinder-scheduler - - restart cinder-api + with_items: services | union(services_noarch) -- cgit 1.2.3-korg