airship
/
treasuremap
Code Issues Proposed changes

Updated openstack-help-infra for Ubuntu 18.04 

Updated the commit id for openstack-helm-infra to include fix for
name resolution issue for Ubuntu 18.04

Change-Id: I32e691696b72c67e88df83b0d511aece380faa46
This commit is contained in:
Ahmad Mahmoudi 2020-01-28 13:59:29 -06:00
parent 406aff9c5c
commit 09a844fee1
2 changed files with 10 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}"

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

@ -40,4 +40,13 @@ if echo $(groups) | grep -qv 'docker'; then
fi
END_SCRIPT
# clean up /etc/resolv.conf, if it includes a loaclhost dns address
_RESOLV_CONF="/etc/resolv.conf"
sudo cp ${_RESOLV_CONF} ${_RESOLV_CONF}.bkp
cat ${_RESOLV_CONF}
if [[ ! -z $(cat ${_RESOLV_CONF} | awk '/nameserver/ && /127.0.0.1/') ]]; then
sudo sed -i '/^nameserver.*127.0.0.1/d' ${_RESOLV_CONF}
fi
cat ${_RESOLV_CONF}
cd "${CURRENT_DIR}"