diff options
| author |   Feng Pan <fpan@redhat.com> | 2017-02-22 14:44:39 -0500 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2017-03-12 22:43:53 -0400 |
| commit | 78a9d70f7f6a5b0b0f941c849a9250da2181c428 (patch) | |
| tree | d9256a30c6b973ded974a22b38c19d78f6761078 /lib/undercloud-functions.sh | |
| parent | 05954847525a0eab9db88ab6f327fb960e1fbd03 (diff) | |
Add support for odl_l3-fdio
This patch adds support for ODL L3 FDIO scenario.
Introduces a new deploy settings parameter, odl_routing_node, to
indicate the routing node's hostname. This parameter will only
be used for this scenario.
Change-Id: I8df3eb701299007761c6cec42c4ca318b124a0b8
opnfv-tht-pr: 108
os-net-config-pr: 4
Signed-off-by: Feng Pan <fpan@redhat.com>
(cherry picked from commit 7d994a3c3e18227c26bf58049e4d5780144ecf98)
Diffstat (limited to 'lib/undercloud-functions.sh')
| -rwxr-xr-x | lib/undercloud-functions.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/undercloud-functions.sh b/lib/undercloud-functions.sh index 080fcbbd..2a370bff 100755 --- a/lib/undercloud-functions.sh +++ b/lib/undercloud-functions.sh @@ -127,7 +127,11 @@ function configure_undercloud { # check for ODL L3/ONOS if [ "${deploy_options_array['sdn_l3']}" == 'True' ]; then - ext_net_type=br-ex + if [ "${deploy_options_array['dataplane']}" == 'fdio' ]; then + ext_net_type=vpp_interface + else + ext_net_type=br-ex + fi fi if [ "${deploy_options_array['dataplane']}" == 'ovs_dpdk' ]; then @@ -136,12 +140,12 @@ function configure_undercloud { ovs_dpdk_bridge='' fi - if ! controller_nic_template=$(python3 -B $LIB/python/apex_python_utils.py nic-template -r controller -s $NETSETS -t $BASE/nics-template.yaml.jinja2 -e "br-ex"); then + if ! controller_nic_template=$(python3 -B $LIB/python/apex_python_utils.py nic-template -r controller -s $NETSETS -t $BASE/nics-template.yaml.jinja2 -e "br-ex" --deploy-settings-file $DEPLOY_SETTINGS_FILE); then echo -e "${red}ERROR: Failed to generate controller NIC heat template ${reset}" exit 1 fi - if ! compute_nic_template=$(python3 -B $LIB/python/apex_python_utils.py nic-template -r compute -s $NETSETS -t $BASE/nics-template.yaml.jinja2 -e $ext_net_type -d "$ovs_dpdk_bridge"); then + if ! compute_nic_template=$(python3 -B $LIB/python/apex_python_utils.py nic-template -r compute -s $NETSETS -t $BASE/nics-template.yaml.jinja2 -e $ext_net_type -d "$ovs_dpdk_bridge" --deploy-settings-file $DEPLOY_SETTINGS_FILE); then echo -e "${red}ERROR: Failed to generate compute NIC heat template ${reset}" exit 1 fi |