diff options
| author |   Justin chi <chigang@huawei.com> | 2018-06-29 13:47:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-06-29 13:47:34 +0000 |
| commit | 20e229822b31b03e1120c3e5efd4ba131261617e (patch) | |
| tree | ff2712b6d5942327b4364959defd094086d2a2a0 /compass-tasks-k8s/arm64/run.sh | |
| parent | 60f3e7471202e2af220633cdb8137224287aced4 (diff) | |
| parent | 6829c69226b285dcc1be5a8ca05c81df33615874 (diff) | |
Merge "fixup docker package and upgrade k8s to 1.9.1"opnfv-7.0.0
Diffstat (limited to 'compass-tasks-k8s/arm64/run.sh')
| -rw-r--r-- | compass-tasks-k8s/arm64/run.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/compass-tasks-k8s/arm64/run.sh b/compass-tasks-k8s/arm64/run.sh index d75e28d..a9e9cee 100644 --- a/compass-tasks-k8s/arm64/run.sh +++ b/compass-tasks-k8s/arm64/run.sh @@ -10,15 +10,11 @@ rm -rf /opt/kargo_k8s git clone https://github.com/kubernetes-incubator/kubespray.git /opt/kargo_k8s cd /opt/kargo_k8s -git checkout v2.2.1 +git checkout f4180503c891bea4b4b77a2f7cc93923411a7449 -b k8s1.9.1 -# bugfix: https://github.com/kubernetes-incubator/kubespray/pull/1727 -git format-patch -1 dae9f6d3 --stdout | git apply # support etcd on arm64 git apply /root/etcd-arm64.patch -# increase container startup timeout -git apply /root/thunderx1.patch # fix docker package git apply /root/docker-pkg.patch -pip install ansible==2.3.1.0 +pip install ansible==2.4.2.0 |