suport installing openstack kilo on centos 7

JIRA: COMPASS-141

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

9 files changed, 44 insertions, 7 deletions

diff --git a/deploy/adapters/ansible/roles/common/tasks/main.yml b/deploy/adapters/ansible/roles/common/tasks/main.yml
index 04a18a83..3114e638 100644
--- a/deploy/adapters/ansible/roles/common/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/common/tasks/main.yml
@@ -5,6 +5,11 @@
   apt: pkg=landscape-common state=absent purge=yes
   when: ansible_os_family == "Debian"
 
+
+- name: install pip packages
+  pip: name={{ item }} state=present extra_args='--pre'
+  with_items: pip_packages
+
 - name: update hosts files to all hosts
   template: src=hosts dest=/etc/hosts backup=yes
 
@@ -35,7 +40,7 @@
   file: path=~/.pip state=directory
 
 - name: update pip.conf
-  template: src=pip.conf dest=~/.pip/pip.conf
+  template: src=pip.conf dest=~/.pip/{{ pip_conf }}
 
 - name: update ntp conf
   template: src=ntp.conf dest=/etc/ntp.conf backup=yes
diff --git a/deploy/adapters/ansible/roles/common/vars/Debian.yml b/deploy/adapters/ansible/roles/common/vars/Debian.yml
index c471d148..bc273a10 100644
--- a/deploy/adapters/ansible/roles/common/vars/Debian.yml
+++ b/deploy/adapters/ansible/roles/common/vars/Debian.yml
@@ -6,6 +6,10 @@ packages:
   - openvswitch-switch
   - crudini
 
+pip_packages: []
+
+pip_conf: pip.conf
+
 services: []
 
 ntp_service: ntp
diff --git a/deploy/adapters/ansible/roles/common/vars/RedHat.yml b/deploy/adapters/ansible/roles/common/vars/RedHat.yml
index 57172b7f..10aa7715 100644
--- a/deploy/adapters/ansible/roles/common/vars/RedHat.yml
+++ b/deploy/adapters/ansible/roles/common/vars/RedHat.yml
@@ -1,8 +1,12 @@
 ---
 packages:
-  - python-devel
   - openvswitch
 
+pip_packages:
+  - crudini
+
+pip_conf: .pip.conf
+
 services:
   - openvswitch
 
diff --git a/deploy/adapters/ansible/roles/database/tasks/mongodb.yml b/deploy/adapters/ansible/roles/database/tasks/mongodb.yml
index 5ca23a19..c46a2932 100644
--- a/deploy/adapters/ansible/roles/database/tasks/mongodb.yml
+++ b/deploy/adapters/ansible/roles/database/tasks/mongodb.yml
@@ -3,6 +3,10 @@
   action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
   with_items: mongodb_packages | union(packages_noarch)
 
+- name: install pymongod packages
+  pip: name={{ item }} state=present extra_args='--pre'
+  with_items: pip_packages
+
 - name: copy ceilometer configs
   template: src=mongodb.conf dest=/opt/os_templates backup=yes
 
@@ -17,7 +21,7 @@
     - /var/lib/mongodb/journal/*
 
 - name: manually restart mongodb server
-  service: name=mongodb state=restarted
+  service: name={{ mongodb_serveice }} state=restarted
 
 - wait_for: port=27017 delay=3 timeout=60 host={{ internal_vip.ip }}
 
diff --git a/deploy/adapters/ansible/roles/database/vars/Debian.yml b/deploy/adapters/ansible/roles/database/vars/Debian.yml
index 6f085ffd..7035c2bf 100644
--- a/deploy/adapters/ansible/roles/database/vars/Debian.yml
+++ b/deploy/adapters/ansible/roles/database/vars/Debian.yml
@@ -15,8 +15,12 @@ maridb_packages:
   - mysql-wsrep-server-5.5
   - galera-3
 
+pip_packages: []
+
 services: []
 
+mongodb_serveice: mongodb
+
 mysql_config_file_path: "/etc/mysql"
 mysql_config_file_name: ["my.cnf"]
 wsrep_config_file_path: "/etc/mysql/conf.d"
diff --git a/deploy/adapters/ansible/roles/database/vars/RedHat.yml b/deploy/adapters/ansible/roles/database/vars/RedHat.yml
index a4171559..ac2f2f22 100644
--- a/deploy/adapters/ansible/roles/database/vars/RedHat.yml
+++ b/deploy/adapters/ansible/roles/database/vars/RedHat.yml
@@ -4,13 +4,23 @@ mysql_packages:
   - mysql-server
 
 maridb_packages:
+  - MySQL-python
   - MariaDB-Galera-server
   - MariaDB-client
   - galera
   - MySQL-python
 
+mongodb_packages:
+    - mongo-10gen-server
+    - mongo-10gen
+
+pip_packages:
+    - pymongo
+
 services: []
 
+mongodb_serveice: mongod
+
 mysql_config_file_path: "/etc/my.cnf.d"
 mysql_config_file_name: ["my-huge.cnf", "server.cnf"]
 wsrep_config_file_path: "/etc/my.cnf.d"
diff --git a/deploy/adapters/ansible/roles/setup-network/tasks/main.yml b/deploy/adapters/ansible/roles/setup-network/tasks/main.yml
index 8667a9b1..818ac57a 100644
--- a/deploy/adapters/ansible/roles/setup-network/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/setup-network/tasks/main.yml
@@ -24,7 +24,7 @@
     - setup_networks/setup_networks.py
 
 - name: copy boot scripts
-  copy:  src={{ item }} dest=/etc/init.d mode=0755
+  copy:  src={{ item }} dest=/etc/init.d/ mode=0755
   with_items:
     - setup_networks/net_init
 
diff --git a/deploy/compass_vm.sh b/deploy/compass_vm.sh
index 3ba20266..958bf33b 100644
--- a/deploy/compass_vm.sh
+++ b/deploy/compass_vm.sh
@@ -38,6 +38,7 @@ function wait_ok() {
         sleep 1
         let retry+=1
         if [[ $retry -ge $1 ]];then
+            timeout 1s ssh $ssh_args root@$MGMT_IP "exit"
             log_error "os install time out"
             exit 1
         fi
diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf
index b905957d..39e6d467 100644
--- a/deploy/conf/cluster.conf
+++ b/deploy/conf/cluster.conf
@@ -1,9 +1,14 @@
 export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu-14\.04\.3.*'}
-#export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*1503-01.*'}
 export REPO_NAME=${REPO_NAME:-"trusty-juno-ppa"}
-#export REPO_NAME=${REPO_NAME:-"centos7-juno-ppa"}
 export ADAPTER_NAME="openstack_juno"
 export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$"
-export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes"
+export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-juno"
+
+#export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*1503-01.*'}
+#export REPO_NAME=${REPO_NAME:-"centos7-kilo-ppa"}
+#export ADAPTER_NAME="openstack_kilo"
+#export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$"
+#export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-kilo"
+
 export DEFAULT_ROLES=""
 export VIP="10.1.0.222"