Skip to content

Commit

Permalink
Gate: Fix version of ansible deployed via dev-deploy
Browse files Browse the repository at this point in the history
This pins the version of ansible deployed via the makefile
dev-deploy directives to the version used in zuul.  This was
causing issues with docker, as make dev-deploy setup-host was
deploying ansible 2.6. Ansible 2.6 introduces a new flag to the
docker_container module (init) that is incompatible with our
current roles, which resulted in observed failures in osh-infra
and osh

Change-Id: I8f83fb65206ad2d3895d234b27193657d5d39c54
Closes-Bug: #1779709
  • Loading branch information
wilkers-steve authored and Prabhu Seshachellam committed Jul 3, 2018
1 parent 20d1681 commit ade680e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
8 changes: 6 additions & 2 deletions tools/gate/devel/start.sh
Expand Up @@ -55,8 +55,12 @@ function ansible_install {
sudo -H -E pip install --no-cache-dir --upgrade pip
sudo -H -E pip install --no-cache-dir --upgrade setuptools
sudo -H -E pip install --no-cache-dir --upgrade pyopenssl
sudo -H -E pip install --no-cache-dir \
ansible \
# NOTE(srwilkers): Pinning ansible to 2.5.5, as pip installs 2.6 by default.
# 2.6 introduces a new command flag (init) for the docker_container module
# that is incompatible with what we have currently. 2.5.5 ensures we match
# what's deployed in the gates
sudo -H -E pip install --no-cache-dir --upgrade "ansible==2.5.5"
sudo -H -E pip install --no-cache-dir --upgrade \
ara \
yq
}
Expand Down
7 changes: 6 additions & 1 deletion tools/images/kubeadm-aio/Dockerfile
Expand Up @@ -58,7 +58,12 @@ RUN set -ex ;\
hash -r ;\
pip --no-cache-dir install setuptools ;\
pip --no-cache-dir install kubernetes ;\
pip --no-cache-dir install ansible ;\

# NOTE(srwilkers): Pinning ansible to 2.5.5, as pip installs 2.6 by default.
# 2.6 introduces a new command flag (init) for the docker_container module
# that is incompatible with what we have currently. 2.5.5 ensures we match
# what's deployed in the gates
pip --no-cache-dir install "ansible==2.5.5" ;\
for BINARY in kubectl kubeadm; do \
curl -sSL -o /usr/bin/${BINARY} \
https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION}/bin/linux/amd64/${BINARY} ;\
Expand Down

0 comments on commit ade680e

Please sign in to comment.