diff options
| author |   Yifei Xue <xueyifei@huawei.com> | 2018-01-04 11:21:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-04 11:21:47 +0000 |
| commit | ffe422a25d54122fd3dfa2d82531253c3cda2ba7 (patch) | |
| tree | 74bcf69e9354dece6470d096e1cef6a0b0c35f5f | |
| parent | 1fd5b7306fc9447aa90dd10189f884a78610f82c (diff) | |
| parent | ebb01242c6b2ecc00d5ec9eefc27364bafc71deb (diff) | |
Merge "Update compass-tasks"
| -rw-r--r-- | compass-tasks/Dockerfile | 3 | ||||
| -rw-r--r-- | compass-tasks/run.sh | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/compass-tasks/Dockerfile b/compass-tasks/Dockerfile index fc9f06d..3fa6eac 100644 --- a/compass-tasks/Dockerfile +++ b/compass-tasks/Dockerfile @@ -1,4 +1,5 @@ -FROM opnfv/compass-tasks-base +FROM huangxiangyu/compass-tasks-base +ARG BRANCH=master ADD ./run.sh /root/ #ADD ./tacker_conf /opt/tacker_conf diff --git a/compass-tasks/run.sh b/compass-tasks/run.sh index dcc96e4..1897191 100644 --- a/compass-tasks/run.sh +++ b/compass-tasks/run.sh @@ -6,7 +6,7 @@ yum install git ntp wget ntpdate openssh-server python-devel sudo '@Development systemctl stop firewalld systemctl mask firewalld -pip install ansible==2.3.2.0 +#pip install ansible==2.3.2.0 rm -rf /opt/kargo_k8s git clone https://github.com/kubernetes-incubator/kubespray.git /opt/kargo_k8s cd /opt/kargo_k8s @@ -30,7 +30,8 @@ cd /opt/openstack-ansible #git checkout b962eed003580ee4c3bd69da911f20b3905a9176 #git checkout da37351ca0a96ed38de72f3e00a7549a024cb810 #git checkout 71110d6bc0f459b668948aca185139c1d79f0452 -git checkout 16c69046bfd90d1b984de43bc6267fece6b75f1c +#git checkout 16c69046bfd90d1b984de43bc6267fece6b75f1c +git checkout 4cde8f86aaea1fde7c43016f661119879068a133 git checkout -b stable/pike @@ -60,4 +61,8 @@ sed -i 's/#repo_build_git_cache/repo_build_git_cache/g' repo_all.yml cp /opt/setup-complete.yml /opt/openstack-ansible/playbooks/ echo "- include: setup-complete.yml" >> /opt/openstack-ansible/playbooks/setup-infrastructure.yml -mv /usr/local/bin/ansible /tmp +# rm ansible json module +# mv /usr/lib/python2.7/site-packages/ansible/plugins/callback/json.py* /tmp/ + +# add ansible-playbook for normal use +ln -s /root/.virtualenvs/compass-core/bin/ansible-playbook /usr/bin/ansible-playbook |