support deployment openstack juno with ansible for compass in centos7.1

JIRA: COMPASS-6

Change-Id: I8ef865e8acfe29c3ff5c7e9030e4cebabed3457b
Signed-off-by: baigk <baiguoku@huawei.com>

6 files changed, 28 insertions, 19 deletions

diff --git a/deploy/adapters/ansible/roles/cinder-controller/handlers/main.yml b/deploy/adapters/ansible/roles/cinder-controller/handlers/main.yml
index ef671dd0..21dde842 100644
--- a/deploy/adapters/ansible/roles/cinder-controller/handlers/main.yml
+++ b/deploy/adapters/ansible/roles/cinder-controller/handlers/main.yml
@@ -1,6 +1,5 @@
 ---
-- name: restart cinder-scheduler
-  service: name=cinder-scheduler state=restarted enabled=yes
-- name: restart cinder-api
-  service: name=cinder-api state=restarted enabled=yes
+- name: restart cinder control serveice
+  service: name={{ item }} state=restarted enabled=yes
+  with_items: services | union(services_noarch)
 
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)
 
diff --git a/deploy/adapters/ansible/roles/cinder-controller/vars/Debian.yml b/deploy/adapters/ansible/roles/cinder-controller/vars/Debian.yml
index e1c096e7..a04fe8f0 100644
--- a/deploy/adapters/ansible/roles/cinder-controller/vars/Debian.yml
+++ b/deploy/adapters/ansible/roles/cinder-controller/vars/Debian.yml
@@ -1,9 +1,9 @@
 ---
+
 packages:
   - cinder-api
   - cinder-scheduler
-  - python-cinderclient
 
 services:
-  - "cinder-api"
-  - "cinder-scheduler"
+  - cinder-api
+  - cinder-scheduler
diff --git a/deploy/adapters/ansible/roles/cinder-controller/vars/RedHat.yml b/deploy/adapters/ansible/roles/cinder-controller/vars/RedHat.yml
new file mode 100644
index 00000000..e059c271
--- /dev/null
+++ b/deploy/adapters/ansible/roles/cinder-controller/vars/RedHat.yml
@@ -0,0 +1,8 @@
+---
+packages:
+  - openstack-cinder
+  - python-oslo-db
+
+services:
+  - openstack-cinder-api
+  - openstack-cinder-scheduler
diff --git a/deploy/adapters/ansible/roles/cinder-controller/vars/main.yml b/deploy/adapters/ansible/roles/cinder-controller/vars/main.yml
new file mode 100644
index 00000000..561952c2
--- /dev/null
+++ b/deploy/adapters/ansible/roles/cinder-controller/vars/main.yml
@@ -0,0 +1,6 @@
+---
+packages_noarch:
+  - python-cinderclient
+
+services_noarch: []
+