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:
parent
f00f35a2ab
commit
063ee39ee6
|
@ -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}"
|
||||
|
|
|
@ -24,6 +24,15 @@ if [ -n "${PROXY}" ]; then
|
|||
. tools/deployment/airskiff/common/setup-proxy.sh
|
||||
fi
|
||||
|
||||
# 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}
|
||||
|
||||
# Deploy K8s with Minikube
|
||||
cd "${OSH_INFRA_PATH}"
|
||||
bash -c "./tools/deployment/common/005-deploy-k8s.sh"
|
||||
|
|
|
@ -37,6 +37,13 @@ mkdir -p ${PL_OUTPUT}
|
|||
|
||||
TERM_OPTS="-l info" ${PEGLEG} site -r . collect ${PL_SITE} -s ${PL_OUTPUT}
|
||||
|
||||
ls -lta /etc/resolv.conf
|
||||
cat /etc/resolv.conf
|
||||
#look for 127.0.0.1 nameserver, if found move it to the end of the list.
|
||||
sed -i '/127.0.0.1/d' /etc/resolv.conf
|
||||
echo "nameserver 127.0.0.1" >> /etc/resolv.conf
|
||||
cat /etc/resolv.conf
|
||||
|
||||
# Start the deployment
|
||||
${SHIPYARD} create configdocs airskiff-design \
|
||||
--replace \
|
||||
|
|
Loading…
Reference in New Issue