diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2018-05-28 07:50:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-05-28 07:50:00 +0000 |
| commit | a1bfcb72907a1a16fb9848ff77dfd2356449686a (patch) | |
| tree | e13a64603c5addf03a3bee69960d092e16449aba /compass-tasks-osa | |
| parent | db6ff2c939748179c68d8662d0e67349d4427eeb (diff) | |
| parent | 17d64aa5a2c4202604678b9602f13488f0e7e0fa (diff) | |
Merge "compass-tasks-osa: upgrade from Pike to Queens"
Diffstat (limited to 'compass-tasks-osa')
| -rw-r--r-- | compass-tasks-osa/Dockerfile | 2 | ||||
| -rw-r--r-- | 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/ |