diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-09-10 03:01:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-10 03:01:14 +0000 |
| commit | 6a07c774db6e94e34d3aea4fbcc2bee75633fe6b (patch) | |
| tree | 921bb401f8b5044d70f77e61a0a84844880a0979 /lib | |
| parent | a715ec7cd3677b22c6961342491d61637a487586 (diff) | |
| parent | d327766d7e7ff91f4ed1a11cfcda70254420f524 (diff) | |
Merge "Enables networking-vpp in nosdn-fdio scenario"
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 53c7eef2..e278a68e 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -52,6 +52,9 @@ function overcloud_deploy { exit 1 elif [[ -z "${deploy_options_array['sdn_controller']}" || "${deploy_options_array['sdn_controller']}" == 'False' ]]; then echo -e "${blue}INFO: SDN Controller disabled...will deploy nosdn scenario${reset}" + if [ "${deploy_options_array['vpp']}" == 'True' ]; then + DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-ml2-networking-vpp.yaml" + fi SDN_IMAGE=opendaylight else echo "${red}Invalid sdn_controller: ${deploy_options_array['sdn_controller']}${reset}" |