diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-03-28 03:40:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-28 03:40:57 +0000 |
| commit | b28482b5804308c4d88439020b56288d86a67ab1 (patch) | |
| tree | bf1bc4efe0c70a42c1b39c55d46e62c2556eccfa /lib | |
| parent | 97de7b9e2bdcb63613c99b9db4d77ad125d410f0 (diff) | |
| parent | 37f0a8b3c451f369c00920c9c1568de6e24e92f4 (diff) | |
Merge "Adding OVN as an SDN option to Apex"
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 1dc819d7..37e8229b 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -55,6 +55,15 @@ function overcloud_deploy { # DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/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" + echo "${red}OVN HA support is not not supported... exiting.${reset}" + exit 1 + else + DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-ml2-ovn.yaml" + fi + SDN_IMAGE=opendaylight elif [ "${deploy_options_array['sdn_controller']}" == 'opencontrail' ]; then echo -e "${red}ERROR: OpenContrail is currently unsupported...exiting${reset}" exit 1 @@ -268,6 +277,17 @@ EOI DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml" fi + if [ "${deploy_options_array['sdn_controller']}" == 'ovn' ]; then + # The epoch in deloran's ovs is 1: and in leif's is 0: + # so we have to execute a downgrade instead of an update + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI + LIBGUESTFS_BACKEND=direct virt-customize \ + --run-command "cd /root/ovs27 && yum update -y *openvswitch*" \ + --run-command "cd /root/ovs27 && yum downgrade -y *openvswitch*" \ + -a overcloud-full.qcow2 +EOI + fi + # get number of nodes available in inventory num_control_nodes=$(ssh -T ${SSH_OPTIONS[@]} "root@$UNDERCLOUD" "grep -c profile:control /home/stack/instackenv.json") num_compute_nodes=$(ssh -T ${SSH_OPTIONS[@]} "root@$UNDERCLOUD" "grep -c profile:compute /home/stack/instackenv.json") |