Merge "bug fix:support centos 7.1 deployment"

9 files changed, 31 insertions, 7 deletions

diff --git a/deploy/adapters/ansible/roles/database/vars/RedHat.yml b/deploy/adapters/ansible/roles/database/vars/RedHat.yml
index 12eedf51..7213d7fa 100644
--- a/deploy/adapters/ansible/roles/database/vars/RedHat.yml
+++ b/deploy/adapters/ansible/roles/database/vars/RedHat.yml
@@ -1,6 +1,6 @@
 ---
 mysql_packages:
-  - python-mysqldb
+  - MySQL-python
   - mysql-server
 
 maridb_packages:
diff --git a/deploy/adapters/ansible/roles/monitor/files/check_Debian_service.sh b/deploy/adapters/ansible/roles/monitor/files/check_Debian_service.sh
new file mode 100644
index 00000000..0138100c
--- /dev/null
+++ b/deploy/adapters/ansible/roles/monitor/files/check_Debian_service.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+services=`cat /opt/service | uniq`
+for service in $services; do
+    if [ `/sbin/initctl list|awk '/stop\/waiting/{print $1}'|uniq | grep $service` ]; then
+        /sbin/start $service
+    fi
+done
diff --git a/deploy/adapters/ansible/roles/monitor/files/check_RedHat_service.sh b/deploy/adapters/ansible/roles/monitor/files/check_RedHat_service.sh
new file mode 100644
index 00000000..0fd921f4
--- /dev/null
+++ b/deploy/adapters/ansible/roles/monitor/files/check_RedHat_service.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+services=`cat /opt/service | uniq`
+for service in $services; do
+    /usr/sbin/service $service status >/dev/null 2>&1
+    if [[ $? -ne 0 ]]; then
+        /usr/sbin/service $service start
+    fi
+done
diff --git a/deploy/adapters/ansible/roles/monitor/tasks/main.yml b/deploy/adapters/ansible/roles/monitor/tasks/main.yml
index e5b93f39..6e446944 100644
--- a/deploy/adapters/ansible/roles/monitor/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/monitor/tasks/main.yml
@@ -1,11 +1,13 @@
 ---
+- include_vars: "{{ ansible_os_family }}.yml"
+
 - name: copy service check file
-  copy: src=check_service.sh dest=/usr/local/bin/check_service.sh mode=0777
+  copy: src=check_{{ ansible_os_family }}_service.sh dest=/usr/local/bin/check_service.sh mode=0777
 
 - name: copy cron file
-  copy: src=root dest=/var/spool/cron/crontabs/root mode=0600
+  copy: src=root dest={{ cron_path }}/root mode=0600
 
 - name: restart cron
-  service: name=cron state=restarted
+  service: name={{ cron }} state=restarted
 
 
diff --git a/deploy/adapters/ansible/roles/monitor/vars/Debian.yml b/deploy/adapters/ansible/roles/monitor/vars/Debian.yml
new file mode 100644
index 00000000..7de590c9
--- /dev/null
+++ b/deploy/adapters/ansible/roles/monitor/vars/Debian.yml
@@ -0,0 +1,4 @@
+---
+cron: cron
+cron_path: "/var/spool/cron/crontabs"
+
diff --git a/deploy/adapters/ansible/roles/monitor/vars/RedHat.yml b/deploy/adapters/ansible/roles/monitor/vars/RedHat.yml
new file mode 100644
index 00000000..f4ff7657
--- /dev/null
+++ b/deploy/adapters/ansible/roles/monitor/vars/RedHat.yml
@@ -0,0 +1,3 @@
+---
+cron: crond
+cron_path: "/var/spool/cron"
diff --git a/deploy/adapters/ansible/roles/neutron-network/vars/RedHat.yml b/deploy/adapters/ansible/roles/neutron-network/vars/RedHat.yml
index 4be67bd1..c6c9bd85 100644
--- a/deploy/adapters/ansible/roles/neutron-network/vars/RedHat.yml
+++ b/deploy/adapters/ansible/roles/neutron-network/vars/RedHat.yml
@@ -11,4 +11,4 @@ openvswitch_agent: neutron-openvswitch-agent
 
 xorp_packages:
   - openssl098e
-  - xorp
+#  - xorp
diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf
index 72602ea0..71fe0b76 100644
--- a/deploy/conf/cluster.conf
+++ b/deploy/conf/cluster.conf
@@ -1,5 +1,5 @@
 export ADAPTER_OS_PATTERN='(?i)ubuntu-14\.04\.3.*'
-#export ADAPTER_OS_PATTERN='(?i)centos-7\.1.*'
+#export ADAPTER_OS_PATTERN='(?i)CentOS-7.*1503-01.*'
 export ADAPTER_NAME="openstack_juno"
 export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$"
 export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes"
diff --git a/deploy/conf/five.conf b/deploy/conf/five.conf
index 32181b58..9abc3e9e 100644
--- a/deploy/conf/five.conf
+++ b/deploy/conf/five.conf
@@ -1,5 +1,5 @@
 export ADAPTER_OS_PATTERN='(?i)ubuntu-14\.04\.3.*'
-#export ADAPTER_OS_PATTERN='(?i)centos-7\.1.*'
+#export ADAPTER_OS_PATTERN='(?i)CentOS-7.*1503-01.*'
 export ADAPTER_NAME="openstack_juno"
 export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$"
 export ADAPTER_FLAVOR_PATTERN="single-controller"