From 17d64aa5a2c4202604678b9602f13488f0e7e0fa Mon Sep 17 00:00:00 2001
From: ramamani yeleswarapu <ramamani.yeleswarapu@intel.com>
Date: Thu, 26 Apr 2018 16:24:13 -0700
Subject: compass-tasks-osa: upgrade from Pike to Queens

Change-Id: I42e6efc5255caf8312fc4b18e7bbad0687f07a1f
Signed-off-by: Ramamani Yeleswarapu <ramamani.yeleswarapu@intel.com>
---
 compass-tasks-osa/Dockerfile |  2 +-
 compass-tasks-osa/run.sh     | 33 ++++++++++++++++++---------------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/compass-tasks-osa/Dockerfile b/compass-tasks-osa/Dockerfile
index 91abdc8..bc2a0c2 100644
--- a/compass-tasks-osa/Dockerfile
+++ b/compass-tasks-osa/Dockerfile
@@ -2,7 +2,7 @@ FROM opnfv/compass-tasks-base
 ARG BRANCH=master
 
 ADD ./run.sh /root/
-ADD ./tacker_conf /opt/tacker_conf
+#ADD ./tacker_conf /opt/tacker_conf
 ADD ./setup-complete.yml /opt/
 RUN chmod +x /root/run.sh
 RUN /root/run.sh
diff --git a/compass-tasks-osa/run.sh b/compass-tasks-osa/run.sh
index 63e5cb0..aa924b8 100644
--- a/compass-tasks-osa/run.sh
+++ b/compass-tasks-osa/run.sh
@@ -1,35 +1,38 @@
 #!/bin/bash
 
+pip install pyyaml
+
 # add ansible-playbook for normal use
 ln -s /root/.virtualenvs/compass-core/bin/ansible-playbook /usr/bin/ansible-playbook
 
-yum install https://rdoproject.org/repos/openstack-pike/rdo-release-pike.rpm -y
+yum install https://rdoproject.org/repos/openstack-queens/rdo-release-queens.rpm -y
 yum install git ntp wget ntpdate openssh-server python-devel sudo '@Development Tools' -y
 
 systemctl stop firewalld
 systemctl mask firewalld
 
-mkdir -p /opt/git/
-cd /opt/git/
-wget artifacts.opnfv.org/compass4nfv/package/openstack_pike.tar.gz
-tar -zxvf openstack_pike.tar.gz
-rm -rf openstack_pike.tar.gz
+#mkdir -p /opt/git/
+#cd /opt/git/
+#wget artifacts.opnfv.org/compass4nfv/package/openstack_queens.tar.gz
+#tar -zxvf openstack_queens.tar.gz
+#rm -rf openstack_queens.tar.gz
 
 git clone https://git.openstack.org/openstack/openstack-ansible /opt/openstack-ansible
 
 cd /opt/openstack-ansible
 
-git checkout 16c69046bfd90d1b984de43bc6267fece6b75f1c
+git checkout 2f52fec3cdefcfb0bcc41a807380ecd88fae072e
+#git checkout 16c69046bfd90d1b984de43bc6267fece6b75f1c
 #git checkout 4cde8f86aaea1fde7c43016f661119879068a133
 
-git checkout -b stable/pike
+git checkout -b stable/queens
 
-/bin/cp -rf /opt/tacker_conf/ansible-role-requirements.yml /opt/openstack-ansible/
-/bin/cp -rf /opt/tacker_conf/openstack_services.yml /opt/openstack-ansible/playbooks/defaults/repo_packages/
-/bin/cp -rf /opt/tacker_conf/os-tacker-install.yml /opt/openstack-ansible/playbooks/
-/bin/cp -rf /opt/tacker_conf/tacker.yml /opt/openstack-ansible/playbooks/inventory/env.d/
-/bin/cp -rf /opt/tacker_conf/tacker_all.yml /opt/openstack-ansible/group_vars/
-/bin/cp -rf /opt/tacker_conf/user_secrets.yml /opt/openstack-ansible/etc/openstack_deploy/
+#/bin/cp -rf /opt/tacker_conf/ansible-role-requirements.yml /opt/openstack-ansible/
+#/bin/cp -rf /opt/tacker_conf/openstack_services.yml /opt/openstack-ansible/playbooks/defaults/repo_packages/
+#/bin/cp -rf /opt/tacker_conf/os-tacker-install.yml /opt/openstack-ansible/playbooks/
+#/bin/cp -rf /opt/tacker_conf/tacker.yml /opt/openstack-ansible/playbooks/inventory/env.d/
+#/bin/cp -rf /opt/tacker_conf/tacker_all.yml /opt/openstack-ansible/group_vars/
+#/bin/cp -rf /opt/tacker_conf/user_secrets.yml /opt/openstack-ansible/etc/openstack_deploy/
 
 /bin/cp -rf /opt/openstack-ansible/etc/openstack_deploy /etc/openstack_deploy
 
@@ -42,7 +45,7 @@ rm -f /usr/local/bin/ansible-playbook
 cd /opt/openstack-ansible/scripts/
 python pw-token-gen.py --file /etc/openstack_deploy/user_secrets.yml
 
-cd /opt/openstack-ansible/group_vars
+cd /opt/openstack-ansible/inventory/group_vars
 sed -i 's/#repo_build_git_cache/repo_build_git_cache/g' repo_all.yml
 
 cp /opt/setup-complete.yml /opt/openstack-ansible/playbooks/
-- 
cgit 1.2.3-korg