diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-07-19 13:17:17 -0400 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2016-09-22 15:03:58 -0400 |
| commit | 38de9ff18e44e5c3c1393c060481fbbb27543704 (patch) | |
| tree | 0e1b93aba5d03b08ed3a44f5c7e96e6b66788656 /lib/common-functions.sh | |
| parent | 30a2e131972b7b4dbccb702f0fc329ca6b2dd6a6 (diff) | |
migrating to proposed common network settings file
- proposed in genesis
https://wiki.opnfv.org/display/genesis/Common+Network+Settings
- This patch updates the network_settings files in the config/network dir
and updates the associated bash, python and python tests relative to
the new yaml structure and nomenclature used in the proposed settings
file
JIRA: APEX-262
Change-Id: Ib0dc9d0f21465b38f2a53cff20f71fb9230bfc48
Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'lib/common-functions.sh')
| -rw-r--r-- | lib/common-functions.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/common-functions.sh b/lib/common-functions.sh index 6941093c..ee9ed4e5 100644 --- a/lib/common-functions.sh +++ b/lib/common-functions.sh @@ -33,12 +33,12 @@ function find_ip { af=$2 fi - python3.4 -B $LIB/python/apex_python_utils.py find-ip -i $1 -af $af + python3 -B $LIB/python/apex_python_utils.py find-ip -i $1 -af $af } ##attach interface to OVS and set the network config correctly ##params: bride to attach to, interface to attach, network type (optional) -##public indicates attaching to a public interface +##external indicates attaching to a external interface function attach_interface_to_ovs { local bridge interface local if_ip if_mask if_gw if_file ovs_file if_prefix @@ -79,8 +79,8 @@ function attach_interface_to_ovs { if [[ -z "$if_ip" || -z "$if_mask" ]]; then echo "ERROR: IPADDR or NETMASK/PREFIX missing for ${interface}" return 1 - elif [[ -z "$if_gw" && "$3" == "public_network" ]]; then - echo "ERROR: GATEWAY missing for ${interface}, which is public" + elif [[ -z "$if_gw" && "$3" == "external" ]]; then + echo "ERROR: GATEWAY missing for ${interface}, which is external" return 1 fi |