scottk/openstack-helm
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/openstack-helm.git synced 2025-12-25 17:27:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "gate: add a second upstream DNS server"

Browse Source
This commit is contained in:
Jenkins
2017-09-22 02:57:23 +00:00
committed by Gerrit Code Review
parent 89beee909b 22488a5c14
commit 2fed2f1b91
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/gate/funcs/network.sh
View File

@@ -28,7 +28,8 @@ function net_resolv_pre_kube {
sudo cp -f /etc/resolv.conf /etc/resolv-pre-kube.conf
sudo rm -f /etc/resolv.conf
cat << EOF | sudo tee /etc/resolv.conf
nameserver ${UPSTREAM_DNS}
nameserver ${UPSTREAM_DNS1}
nameserver ${UPSTREAM_DNS2}
EOF
}

3
tools/gate/vars.sh
View File

@@ -49,7 +49,8 @@ export GLANCE=${GLANCE:-"radosgw"}
export SDN_PLUGIN=${SDN_PLUGIN:-"ovs"}
# Set Upstream DNS
export UPSTREAM_DNS=${UPSTREAM_DNS:-"8.8.8.8"}
export UPSTREAM_DNS1=${UPSTREAM_DNS1:-"8.8.8.8"}
export UPSTREAM_DNS2=${UPSTREAM_DNS2:-"8.8.4.4"}
# Set gate script timeouts
export NODE_START_TIMEOUT=${NODE_START_TIMEOUT:="480"}