diff options
| author |   Michael Chapman <michapma@redhat.com> | 2016-10-19 12:50:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-19 12:50:02 +0000 |
| commit | 1513de7f3d75e93b83ebc88b0d40880985f67400 (patch) | |
| tree | 49db9ef76541e7485e40481762813a8acbe2f908 /lib | |
| parent | ce74e17298db0422734fe8ac820cb61b1e5ae601 (diff) | |
| parent | b3840e9981c007e26eb7cbdf94f66d0f58a6e3f7 (diff) | |
Merge "Consolidate ODL SFC RPM into ODL RPM" into stable/colorado
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 0f588b2f..c1cb74f9 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -29,14 +29,6 @@ function overcloud_deploy { DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight.yaml" fi SDN_IMAGE=opendaylight - if [ "${deploy_options_array['sfc']}" == 'True' ]; then - SDN_IMAGE+=-sfc - if [ ! -f $RESOURCES/overcloud-full-${SDN_IMAGE}.qcow2 ]; then - echo "${red} $RESOURCES/overcloud-full-${SDN_IMAGE}.qcow2 is required to execute an SFC deployment." - echo "Please install the opnfv-apex-opendaylight-sfc package to provide this overcloud image for deployment.${reset}" - exit 1 - fi - fi elif [ "${deploy_options_array['sdn_controller']}" == 'opendaylight-external' ]; then DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight-external.yaml" SDN_IMAGE=opendaylight @@ -117,7 +109,7 @@ EOF -a overcloud-full.qcow2 fi - if [ "${deploy_options_array['sdn_controller']}" == 'onos' && "${deploy_options_array['sfc']}" == 'True' ]; then + if [ "${deploy_options_array['sfc']}" == 'True' ]; then # upgrade ovs into ovs 2.5.90 with NSH function 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}" \ |