diff options
| author |   bobzhou <bob.zh@huawei.com> | 2017-03-10 10:09:55 +0800 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2017-05-08 16:05:14 +0000 |
| commit | df5596005c4f0a98c39375feef0bcca55c89f239 (patch) | |
| tree | 7df01195d6daed3e565e850beff17f92c850d321 /lib/overcloud-deploy-functions.sh | |
| parent | b5e4091424ced384b49f6ff13b1ef2b63466f947 (diff) | |
add onos deployment steps
opnfv-tht-pr: 128
opnfv-puppet-tripleo-pr: 23
Change-Id: Ib99f7e3968ed03bd86ca0de9c6c37c9871921486
Signed-off-by: bobzhou <bob.zh@huawei.com>
(cherry picked from commit 266e9a5336defeff5f10331ab8316d69e7b20cc1)
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 a31efbf9..ec53db90 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}" \ |