airship
/
treasuremap
Code Issues Proposed changes

WIP: 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 f00f35a2ab
commit 8b61b21d4c
2 changed files with 15 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}"

14
tools/deployment/airskiff/developer/100-deploy-osh.sh
View File

@ -37,6 +37,20 @@ mkdir -p ${PL_OUTPUT}
TERM_OPTS="-l info" ${PEGLEG} site -r . collect ${PL_SITE} -s ${PL_OUTPUT}
cat /etc/default/docker
cp /etc/default/docker /etc/default/docker.backup
first="true"
sed -ne "s/nameserver //p" /etc/resolv.conf | while read -r ns; do
if [[ "${first}" == "true" ]]; then
dns_opts="--dns ${ns}"
first="false"
else
dns_opts="--dns ${ns} ${dns_opts}"
fi
sed -i "s/^.*DOCKER_OPTS=.*$/DOCKER_OPTS=\"$dns_opts\"/g" /etc/default/docker
done
cat /etc/default/docker
# Start the deployment
${SHIPYARD} create configdocs airskiff-design \
--replace \