diff options
| -rwxr-xr-x | build/overcloud-onos.sh | 6 | ||||
| -rwxr-xr-x | ci/deploy.sh | 3 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 8 |
3 files changed, 10 insertions, 7 deletions
diff --git a/build/overcloud-onos.sh b/build/overcloud-onos.sh index b695983a..2b3e5225 100755 --- a/build/overcloud-onos.sh +++ b/build/overcloud-onos.sh @@ -18,12 +18,6 @@ cp -f overcloud-full.qcow2 overcloud-full-onos_build.qcow2 ##### Adding ONOS to overcloud ##### ####################################### -# 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}" \ - -a overcloud-full-onos_build.qcow2 - - # get the onos files rm -rf puppet-onos populate_cache "$onos_release_uri/$onos_release_file" diff --git a/ci/deploy.sh b/ci/deploy.sh index edc6062a..9affa80a 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -28,6 +28,9 @@ ntp_server="pool.ntp.org" post_config="TRUE" debug="FALSE" +ovs_rpm_name=openvswitch-2.5.90-1.el7.centos.x86_64.rpm +ovs_kmod_rpm_name=openvswitch-kmod-2.5.90-1.el7.centos.x86_64.rpm + declare -i CNT declare UNDERCLOUD declare -A deploy_options_array diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 2066f15a..a7fc5c2e 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -67,7 +67,6 @@ function overcloud_deploy { # Make sure the correct overcloud image is available if [ ! -f $RESOURCES/overcloud-full-${SDN_IMAGE}.qcow2 ]; then echo "${red} $RESOURCES/overcloud-full-${SDN_IMAGE}.qcow2 is required to execute your deployment." - echo "Both ONOS and OpenDaylight are currently deployed from this image." echo "Please install the opnfv-apex package to provide this overcloud image for deployment.${reset}" exit 1 fi @@ -117,6 +116,13 @@ EOF --run-command "sed -i 's/\\(^\\s\\+\\)\\(start_daemon "$OVS_VSWITCHD_PRIORITY"\\)/\\1umask 0002 \\&\\& \\2/' /usr/share/openvswitch/scripts/ovs-ctl" \ -a overcloud-full.qcow2 fi + + if [ "${deploy_options_array['sdn_controller']}" == 'onos' && "${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}" \ + -a overcloud-full.qcow2 + fi EOI elif [ "${deploy_options_array['dataplane']}" != 'ovs' ]; then |