Merge "Handle multi Ethernets case in the gate"

This commit is contained in:
Jenkins 2016-05-02 14:28:51 +00:00 committed by Gerrit Code Review
commit 85134c9e4f

View File

@ -53,6 +53,8 @@ function check_failure {
function write_configs { function write_configs {
mkdir -p /etc/kolla/config 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 cat << EOF > /etc/kolla/globals.yml
--- ---
kolla_base_distro: "${KOLLA_BASE}" kolla_base_distro: "${KOLLA_BASE}"
@ -60,7 +62,7 @@ kolla_install_type: "${KOLLA_TYPE}"
kolla_internal_vip_address: "169.254.169.10" kolla_internal_vip_address: "169.254.169.10"
keepalived_virtual_router_id: "${KEEPALIVED_VIRTUAL_ROUTER_ID}" keepalived_virtual_router_id: "${KEEPALIVED_VIRTUAL_ROUTER_ID}"
docker_restart_policy: "never" docker_restart_policy: "never"
network_interface: "eth0" network_interface: "${PRIVATE_INTERFACE}"
neutron_external_interface: "fake_interface" neutron_external_interface: "fake_interface"
enable_horizon: "no" enable_horizon: "no"
enable_heat: "no" enable_heat: "no"