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

JIRA: COMPASS-6

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

4 files changed, 26 insertions, 7 deletions

diff --git a/deploy/adapters/ansible/roles/keystone/tasks/keystone_install.yml b/deploy/adapters/ansible/roles/keystone/tasks/keystone_install.yml
index 568c040e..32d2b6be 100644
--- a/deploy/adapters/ansible/roles/keystone/tasks/keystone_install.yml
+++ b/deploy/adapters/ansible/roles/keystone/tasks/keystone_install.yml
@@ -2,11 +2,12 @@
 - include_vars: "{{ ansible_os_family }}.yml"
 
 - name: install keystone packages
-  action: "{{ ansible_pkg_mgr }} name=keystone state=present force=yes"
+  action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
+  with_items: packages | union(packages_noarch)
 
 - name: generate keystone service list
   shell: echo {{ item }} >> /opt/service
-  with_items: services
+  with_items: services | union(services_noarch)
 
 - name: update keystone conf
   template: src=keystone.conf dest=/etc/keystone/keystone.conf backup=yes
@@ -15,10 +16,10 @@
   shell: rm /var/lib/keystone/keystone.db || echo sqllite database already removed
 
 - name: cron job to purge expired tokens hourly
-  shell: (crontab -l -u keystone 2>&1 | grep -q token_flush) || echo '@hourly /usr/bin/keystone-manage token_flush > /var/log/keystone/keystone-tokenflush.log 2>&1' >> /var/spool/cron/crontabs/keystone
+  shell: (crontab -l -u keystone 2>&1 | grep -q token_flush) || echo '@hourly /usr/bin/keystone-manage token_flush > /var/log/keystone/keystone-tokenflush.log 2>&1' >> {{ cron_path }}/keystone
 
 - name: modify keystone cron rights
-  file: path=/var/spool/cron/crontabs/keystone mode=0600
+  file: path={{ cron_path }}/keystone mode=0600
 
 - name: keystone source files
   template: src={{ item }} dest=/opt/{{ item }}
@@ -26,5 +27,6 @@
     - admin-openrc.sh
     - demo-openrc.sh
 
-- name: manually start keystone
-  service: name=keystone state=restarted enabled=yes
+- name: restart keystone services
+  service: name={{ item }} state=restarted enabled=yes
+  with_items: services | union(services_noarch)
diff --git a/deploy/adapters/ansible/roles/keystone/vars/Debian.yml b/deploy/adapters/ansible/roles/keystone/vars/Debian.yml
index 101dc46b..e8998a4e 100644
--- a/deploy/adapters/ansible/roles/keystone/vars/Debian.yml
+++ b/deploy/adapters/ansible/roles/keystone/vars/Debian.yml
@@ -1,6 +1,9 @@
 ---
+
+cron_path: "/var/spool/cron/crontabs"
+
 packages:
   - keystone
 
 services:
-  - "keystone"
+  - keystone
diff --git a/deploy/adapters/ansible/roles/keystone/vars/RedHat.yml b/deploy/adapters/ansible/roles/keystone/vars/RedHat.yml
new file mode 100644
index 00000000..91d1217b
--- /dev/null
+++ b/deploy/adapters/ansible/roles/keystone/vars/RedHat.yml
@@ -0,0 +1,8 @@
+---
+cron_path: "/var/spool/cron"
+
+packages:
+  - openstack-keystone
+
+services:
+  - openstack-keystone
diff --git a/deploy/adapters/ansible/roles/keystone/vars/main.yml b/deploy/adapters/ansible/roles/keystone/vars/main.yml
new file mode 100644
index 00000000..cc24916a
--- /dev/null
+++ b/deploy/adapters/ansible/roles/keystone/vars/main.yml
@@ -0,0 +1,6 @@
+---
+packages_noarch:
+  - python-keystoneclient
+
+services_noarch: []
+