airship
/
treasuremap
Code Issues Proposed changes

Merge "Updated openstack-helm-infra for Ubuntu 18.04"

This commit is contained in:
Zuul 2020-02-03 21:41:23 +00:00 committed by Gerrit Code Review
parent 406aff9c5c 37ab579227
commit e0de23a786
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/deployment/airskiff/developer/000-clone-dependencies.sh
View File

@ -19,7 +19,7 @@ set -xe
CURRENT_DIR="$(pwd)"
: "${INSTALL_PATH:="../"}"
: "${OSH_INFRA_COMMIT:="8ba46703ee9fab0115e4b7f62ea43e0798c36872"}"
: "${OSH_INFRA_COMMIT:="eacf93722136636dcfbd2b68c59b71f071ffc085"}"
: "${CLONE_ARMADA:=true}"
: "${CLONE_DECKHAND:=true}"
: "${CLONE_SHIPYARD:=true}"

4
tools/deployment/airskiff/developer/010-deploy-k8s.sh
View File

@ -40,4 +40,8 @@ if echo $(groups) | grep -qv 'docker'; then
fi
END_SCRIPT
# clean up /etc/resolv.conf, if it includes a localhost dns address
sudo sed -i.bkp '/^nameserver.*127.0.0.1/d
w /dev/stdout' /etc/resolv.conf
cd "${CURRENT_DIR}"