summaryrefslogtreecommitdiffstats
path: root/compass-tasks/run.sh
diff options
context:
space:
mode:
authorYifei Xue <xueyifei@huawei.com>2018-01-27 16:33:15 +0800
committerYifei Xue <xueyifei@huawei.com>2018-01-27 16:53:05 +0800
commit9dad460375c3daeedd228e88915e402bcd8ab436 (patch)
tree326a9399c8a910e9b85c812fe900d7acb7d8d3bf /compass-tasks/run.sh
parentd54a004868ffdc838008e050b5840d415bc7d531 (diff)
Add tacker support in compass-containers for Fraser
JIRA: - Add tacker support for OPNFV Fraser including adding secret, git repo, etc. Change-Id: I8dc992e48c12d1452c0094ef9527e405a1a7d692 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
Diffstat (limited to 'compass-tasks/run.sh')
-rw-r--r--compass-tasks/run.sh21
1 files changed, 6 insertions, 15 deletions
diff --git a/compass-tasks/run.sh b/compass-tasks/run.sh
index 2ab0b6f..a8f20e1 100644
--- a/compass-tasks/run.sh
+++ b/compass-tasks/run.sh
@@ -17,32 +17,23 @@ 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
-#cd openstack
-#git clone https://github.com/openstack/tacker.git -b stable/pike
-#cd tacker
-#git checkout a0f1e680d81c7db66ae7a2a08c3d069901d0765a
git clone https://git.openstack.org/openstack/openstack-ansible /opt/openstack-ansible
cd /opt/openstack-ansible
-#git checkout b962eed003580ee4c3bd69da911f20b3905a9176
-#git checkout da37351ca0a96ed38de72f3e00a7549a024cb810
-#git checkout 71110d6bc0f459b668948aca185139c1d79f0452
git checkout 16c69046bfd90d1b984de43bc6267fece6b75f1c
#git checkout 4cde8f86aaea1fde7c43016f661119879068a133
git checkout -b stable/pike
-#/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/setup-openstack.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/playbooks/inventory/group_vars/
-#/bin/cp -rf /opt/tacker_conf/user_secrets.yml /opt/openstack-ansible/etc/openstack_deploy/
-#/bin/cp -rf /opt/tacker_conf/haproxy_config.yml /opt/openstack-ansible/playbooks/vars/configs/
+/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