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/overcloud-deploy-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/overcloud-deploy-functions.sh')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index a46c6c6b..4d4b7647 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -28,7 +28,11 @@ function overcloud_deploy { DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/services/gluon.yaml" fi elif [ "${deploy_options_array['vpp']}" == 'True' ]; then - DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-honeycomb.yaml" + if [ "${deploy_options_array['sdn_l3']}" == "True" ]; then + DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-honeycomb.yaml" + else + DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-honeycomb-l2.yaml" + fi else DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-l3.yaml" fi @@ -145,6 +149,13 @@ EOI EOI fi + #Configure routing node for odl_l3-fdio + if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['dataplane']}" == 'fdio' && "${deploy_options_array['sdn_l3']}" == 'True' ]]; then + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI + sed -i "/opendaylight::vpp_routing_node:/c\ opendaylight::vpp_routing_node: ${deploy_options_array['odl_vpp_routing_node']}.${domain_name}" ${ENV_FILE} +EOI + fi + if [ -n "${deploy_options_array['performance']}" ]; then for option in "${performance_options[@]}" ; do arr=($option) @@ -161,13 +172,6 @@ EOI EOI fi - if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['dataplane']}" == 'fdio' ]]; then - ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI - sed -i "/neutron::agents::dhcp::interface_driver:/c\ neutron::agents::dhcp::interface_driver: neutron.agent.linux.interface.NSDriver" ${ENV_FILE} - sed -i "/neutron::agents::l3::interface_driver:/c\ neutron::agents::l3::interface_driver: neutron.agent.linux.interface.NSDriver" ${ENV_FILE} -EOI - fi - # Set ODL version accordingly if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && -n "${deploy_options_array['odl_version']}" ]]; then case "${deploy_options_array['odl_version']}" in |