aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-03-09 10:21:20 +0800
committerJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-04-28 01:05:42 +0000
commit00720db254f723d85aeaeb843bcaaa7ee4b92c85 (patch)
treefbc89643193cec9168745d16f12f3a11a92062bf
parent2705d67fa14a2e13ad0d13d1be37bfe1b9a89957 (diff)
downloadkolla-00720db254f723d85aeaeb843bcaaa7ee4b92c85.tar.gz
kolla-00720db254f723d85aeaeb843bcaaa7ee4b92c85.zip
Handle multi Ethernets case in the gate
rax-iad node has two Ethernets, but others not. Detect the private Ethernet by using script. Closes-Bug: #1561563 Change-Id: I7c5d241f2b1a21f97512e52c487d875dd270011b
-rwxr-xr-xtools/deploy_aio.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/deploy_aio.sh b/tools/deploy_aio.sh
index b6c507bce..1a06cddad 100755
--- a/tools/deploy_aio.sh
+++ b/tools/deploy_aio.sh
@@ -52,13 +52,15 @@ function check_failure {
function write_configs {
mkdir -p /etc/kolla/config
+ PRIVATE_ADDRESS=$(cat /etc/nodepool/node_private)
+ PRIVATE_INTERFACE=$(ip -4 --oneline address | awk -v pattern=${PRIVATE_ADDRESS} '$0 ~ pattern {print $2}')
cat << EOF > /etc/kolla/globals.yml
---
kolla_base_distro: "${KOLLA_BASE}"
kolla_install_type: "${KOLLA_TYPE}"
kolla_internal_vip_address: "169.254.169.10"
docker_restart_policy: "never"
-network_interface: "eth0"
+network_interface: "${PRIVATE_INTERFACE}"
neutron_external_interface: "fake_interface"
enable_horizon: "no"
enable_heat: "no"