From cb5ae68b968f28c1cedee3720ff14cf5fa1ab92c Mon Sep 17 00:00:00 2001
From: baigk <baiguoku@huawei.com>
Date: Mon, 9 Nov 2015 00:37:19 -0800
Subject: suport installing openstack kilo on centos 7

JIRA: COMPASS-141

Change-Id: I8b4eeacd802124cd05d17c7c24682254f0c567f7
Signed-off-by: baigk <baiguoku@huawei.com>
---
 deploy/adapters/ansible/roles/common/tasks/main.yml        |  7 ++++++-
 deploy/adapters/ansible/roles/common/vars/Debian.yml       |  4 ++++
 deploy/adapters/ansible/roles/common/vars/RedHat.yml       |  6 +++++-
 deploy/adapters/ansible/roles/database/tasks/mongodb.yml   |  6 +++++-
 deploy/adapters/ansible/roles/database/vars/Debian.yml     |  4 ++++
 deploy/adapters/ansible/roles/database/vars/RedHat.yml     | 10 ++++++++++
 deploy/adapters/ansible/roles/setup-network/tasks/main.yml |  2 +-
 7 files changed, 35 insertions(+), 4 deletions(-)

(limited to 'deploy/adapters/ansible/roles')

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
 
-- 
cgit 1.2.3-korg