diff options
| author |   Dan Radez <dradez@redhat.com> | 2017-05-08 15:58:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-05-08 15:58:35 +0000 |
| commit | bf00ebca10d6366058c5ab8875efa020633f34b2 (patch) | |
| tree | 27edaf3a4ccd39a734cdf679b8878b77b897e9e2 /lib/overcloud-deploy-functions.sh | |
| parent | e0eda9d2ce02eb0afddd66f328f8794b073a7958 (diff) | |
| parent | 266e9a5336defeff5f10331ab8316d69e7b20cc1 (diff) | |
Merge "add onos deployment steps"
Diffstat (limited to 'lib/overcloud-deploy-functions.sh')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index e98ea9ca..e5f9134b 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -49,14 +49,12 @@ function overcloud_deploy { DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight-external.yaml" SDN_IMAGE=opendaylight elif [ "${deploy_options_array['sdn_controller']}" == 'onos' ]; then - echo -e "${red}ERROR: ONOS is unsupported in Danube...exiting${reset}" - exit 1 - #if [ "${deploy_options_array['sfc']}" == 'True' ]; then - # DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/onos_sfc.yaml" - #else - # DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/onos.yaml" - #fi - #SDN_IMAGE=onos + if [ "${deploy_options_array['sfc']}" == 'True' ]; then + DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-onos-sfc.yaml" + else + DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-onos.yaml" + fi + SDN_IMAGE=onos elif [ "${deploy_options_array['sdn_controller']}" == 'ovn' ]; then if [[ "$ha_enabled" == "True" ]]; then DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-ml2-ovn-ha.yaml" @@ -168,6 +166,8 @@ EOI # upgrade ovs into ovs 2.5.90 with NSH function if SFC is enabled if [[ "${deploy_options_array['sfc']}" == 'True' && "${deploy_options_array['dataplane']}" == 'ovs' ]]; then + echo "ONOS SFC is currently unavailable. JIRA: APEX-417" + exit 1 ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum install -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_kmod_rpm_name}" \ --run-command "yum upgrade -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_rpm_name}" \ |