openstack/kolla-ansible
Code Issues Proposed changes

Only use default values for MY_IP/MY_DEV in genenv if not set

Browse Source 
This way it is possible to manually specify MY_IP/MY_DEV when running
the genenv script.

Closes-bug: #1475572

Change-Id: I291815a4ed1ea15adbddf94905706c77c8bb5a09
This commit is contained in:
Christian Berendt 2015-07-17 11:58:09 +02:00 committed by Christian Berendt
parent 51b7915ae8
commit 57093e8dfe
1 changed files with 4 additions and 4 deletions

8
tools/genenv

@ -30,11 +30,11 @@ check_binarydependencies
REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')")
cd "$(dirname "$REAL_PATH")/.."
MY_IP=$(ip route get $(ip route | awk '$1 == "default" {print $3}') |
awk '$4 == "src" {print $5}')
MY_IP=${MY_IP:-$(ip route get $(ip route | awk '$1 == "default" {print $3}') |
awk '$4 == "src" {print $5}')}
MY_DEV=$(ip route get $(ip route | awk '$1 == "default" {print $3}') |
awk '$4 == "src" {print $3}')
MY_DEV=${MY_DEV:-$(ip route get $(ip route | awk '$1 == "default" {print $3}') |
awk '$4 == "src" {print $3}')}
echo MY_IP=$MY_IP
echo MY_DEV=$MY_DEV