diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2019-02-14 09:46:46 +0800 |
|---|---|---|
| committer | Harry Huang <huangxiangyu5@huawei.com> | 2019-03-08 15:19:50 +0800 |
| commit | e4834b4de253f27c30e4a085323acdc97efbf83b (patch) | |
| tree | adbcb6fae8f5340dfb45ba346573db966df5e895 | |
| parent | ca317c8a9891c38ce0777ef2eba4f51716092a14 (diff) | |
JIRA: -
1. Upgrade ansible inside virtualenv and link ansible
binaries outside.
2. Upgrade Kubernetes to 1.11.3
Change-Id: Ic41bea94dd25cd1ea99f3a27a100be6e7f9277dd
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
| -rwxr-xr-x | compass-tasks-base/build.sh | 1 | ||||
| -rw-r--r-- | compass-tasks-k8s/run.sh | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/compass-tasks-base/build.sh b/compass-tasks-base/build.sh index 81f3c21..6071734 100755 --- a/compass-tasks-base/build.sh +++ b/compass-tasks-base/build.sh @@ -42,6 +42,7 @@ pip install --upgrade Flask pip install --upgrade virtualenvwrapper source `which virtualenvwrapper.sh` +echo "source /usr/bin/virtualenvwrapper.sh" >> ~/.bashrc mkvirtualenv --system-site-packages compass-core workon compass-core cd $COMPASS_DIR diff --git a/compass-tasks-k8s/run.sh b/compass-tasks-k8s/run.sh index 3a7c0c8..f40d853 100644 --- a/compass-tasks-k8s/run.sh +++ b/compass-tasks-k8s/run.sh @@ -9,5 +9,8 @@ systemctl mask firewalld rm -rf /opt/kargo_k8s git clone https://github.com/kubernetes-incubator/kubespray.git /opt/kargo_k8s cd /opt/kargo_k8s -git checkout f4180503c891bea4b4b77a2f7cc93923411a7449 -b k8s1.9.1 +git checkout 05dabb7e7b5eb7cd9a075064868bafe4dc1cf51f -b k8s1.11.3 +source /root/.virtualenvs/compass-core/bin/activate pip install ansible==2.4.2.0 +ln -s /root/.virtualenvs/compass-core/bin/ansible /usr/bin/ansible +ln -s /root/.virtualenvs/compass-core/bin/ansible-playbook /usr/bin/ansible-playbook |