From 198fb65a19aec562240bfc0f11a2696a27335d55 Mon Sep 17 00:00:00 2001
From: Jerry Zhao <zhaoxinyu@huawei.com>
Date: Fri, 10 Apr 2015 20:21:45 +0800
Subject: [PATCH] add ansible setup setups

fix stale config in group_var

Change-Id: Idfbbabaabc67b8c69f681dda44a8b889ba729b9e
---
 ci/prepare.sh                          |  2 +-
 install/group_vars/all                 | 12 +-----------
 install/roles/compass/tasks/RedHat.yml | 21 ++++++++++++++++++++-
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/ci/prepare.sh b/ci/prepare.sh
index 1dc66ce..9f87812 100644
--- a/ci/prepare.sh
+++ b/ci/prepare.sh
@@ -8,7 +8,7 @@ if [[ $? != 0 ]]; then
 else
     echo "vagrant is already installed"
 fi
-sudo apt-get install libxslt-dev libxml2-dev libvirt-dev build-essential qemu-utils qemu-kvm libvirt-bin virtinst -y
+sudo apt-get install libxslt-dev libxml2-dev libvirt-dev build-essential qemu-utils qemu-kvm libvirt-bin virtinst libmysqld-dev -y
 sudo service libvirt-bin restart
 
 for plugin in vagrant-libvirt vagrant-mutate; do
diff --git a/install/group_vars/all b/install/group_vars/all
index 8b264df..47eea89 100644
--- a/install/group_vars/all
+++ b/install/group_vars/all
@@ -222,14 +222,4 @@ atomic_base_url: http://www6.atomicorp.com/channels/atomic/centos/6/x86_64/RPMS/
 
 # the key to be authorized on pxe boot machines so passwordless login can be
 # done from the machine where you grab the key.
-push_ssh_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUuKnIXwxS9w+Rxb4+CL3iqNQXB+kriQyr89YeLg5X7B0h+r91okw2bgodVvoynH8n7d7afHYew4KH7pMc5a3QMf/gwhhnlfoeyimQg0IOTQ6pvNxifRi5IN9xa3mB3kL9/xVmfo9rUE6ZZ4dNQ91As706SLBzEJWUuICT7fFJqCqHbxNT9aO//TWcoJJH+d+GLfLagyfVxBHb8DcoNSKTq1rFjZCFVs9pg6aO0d6Z3FcyICxOaacsAoRZOsx8+2WsHaZRk6udbqZJHt7LBs9Bc38+YCRhc31Q2jyrm37xT3QchRl4sihqq38N03cTYBksuRfV1dJaso9MUQapa/Lv root@host-1"
-pxe_boot_macs: ['00:00:3a:52:a0:02','00:00:06:e0:08:54']
-test: true
-pxe_boot_macs: ['00:00:5b:61:07:1f','00:00:b9:ae:f7:d1']
-test: true
-pxe_boot_macs: ['00:00:d9:0b:2f:ba','00:00:da:39:7f:58']
-test: true
-pxe_boot_macs: ['00:00:d3:8e:8b:d2','00:00:ac:29:c5:98']
-test: true
-pxe_boot_macs: ['00:00:1d:46:1e:6e','00:00:99:f1:c2:ac']
-test: true
+#push_ssh_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUuKnIXwxS9w+Rxb4+CL3iqNQXB+kriQyr89YeLg5X7B0h+r91okw2bgodVvoynH8n7d7afHYew4KH7pMc5a3QMf/gwhhnlfoeyimQg0IOTQ6pvNxifRi5IN9xa3mB3kL9/xVmfo9rUE6ZZ4dNQ91As706SLBzEJWUuICT7fFJqCqHbxNT9aO//TWcoJJH+d+GLfLagyfVxBHb8DcoNSKTq1rFjZCFVs9pg6aO0d6Z3FcyICxOaacsAoRZOsx8+2WsHaZRk6udbqZJHt7LBs9Bc38+YCRhc31Q2jyrm37xT3QchRl4sihqq38N03cTYBksuRfV1dJaso9MUQapa/Lv root@host-1"
diff --git a/install/roles/compass/tasks/RedHat.yml b/install/roles/compass/tasks/RedHat.yml
index afedd63..1a07df2 100644
--- a/install/roles/compass/tasks/RedHat.yml
+++ b/install/roles/compass/tasks/RedHat.yml
@@ -91,6 +91,11 @@
   pip: name={{ COMPASS_PATH }} virtualenv={{ COMPASS_PATH }}/venv
        extra_args='-i http://pypi.douban.com/simple/'
 
+- name: pip install ansible
+  pip: name=ansible virtualenv={{ COMPASS_PATH }}/venv
+       extra_args='-i http://pypi.douban.com/simple/'
+       state=latest
+
 - name: create compass directories
   file: path={{ item }} state=directory
   with_items:
@@ -102,6 +107,21 @@
 - name: create /var/log/compass
   file: path=/var/log/compass mode=0777 state=directory
 
+- name: create ansible folder
+  file: path=/var/ansible/run state=directory
+  when: "'ansible' in {{ pkg_installer }}"
+
+- name: clone recipes
+  git: repo={{ compass_adapter_source }}
+       dest=/opt/compass-adapters
+       version={{ compass_adapter_version }}
+       update=yes
+       force=yes
+
+- name: copy ansible scripts into ansible folder
+  shell: cp -rf /opt/compass-adapters/ansible/openstack_juno /var/ansible/.
+  when: "'ansible' in {{ pkg_installer }}"
+
 - name: write python home into switch virtualenv
   lineinfile: dest={{ COMPASS_PATH }}/bin/switch_virtualenv.py.template
               regexp="^virtual\_env\ \=\ \'\$PythonHome\'"
@@ -142,7 +162,6 @@
   notify:
     - restart compass service
     - restart http service
-  tags: debug
 
 - name: add cobbler setting
   template: src=cobbler.conf.nodocker.j2 dest=/etc/compass/os_installer/cobbler.conf