diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/installer/onos/onos_gw_mac_update.sh | 56 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 16 |
2 files changed, 8 insertions, 64 deletions
diff --git a/lib/installer/onos/onos_gw_mac_update.sh b/lib/installer/onos/onos_gw_mac_update.sh deleted file mode 100644 index 3b3b0724..00000000 --- a/lib/installer/onos/onos_gw_mac_update.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -# Update gateway mac to onos for l3 function - -# author: Bob zhou -# author: Tim Rozet - - -# Update gateway mac to onos for l3 function -# params: external CIDR, external gateway -function onos_update_gw_mac { - local CIDR - local GW_IP - - if [[ -z "$1" || -z "$2" ]]; then - return 1 - else - CIDR=$1 - GW_IP=$2 - fi - - if [ -z "$UNDERCLOUD" ]; then - #if not found then dnsmasq may be using leasefile-ro - undercloud_mac=$(virsh domiflist undercloud | grep default | \ - grep -Eo "[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+") - UNDERCLOUD=$(/usr/sbin/arp -e | grep ${undercloud_mac} | awk {'print $1'}) - fi - # get controller ip address - controller_ip=$(ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI -source stackrc -openstack server list | grep overcloud-controller-0 | grep -Eo "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" -EOI -) - - if [ -z "$controller_ip" ]; then - echo "ERROR: Failed to find controller_ip for overcloud-controller-0" - return 1 - fi - - # get gateway mac - GW_MAC=$(arping ${GW_IP} -c 1 -I br-external | grep -Eo '([0-9a-fA-F]{2})(([/\s:-][0-9a-fA-F]{2}){5})') - - if [ -z "$GW_MAC" ]; then - echo "ERROR: Failed to find gateway mac for ${GW_IP}" - return 1 - fi - - # update gateway mac to onos - ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI -ssh -T ${SSH_OPTIONS[@]} "heat-admin@${controller_ip}" <<EOF -echo "external gateway mac is ${GW_MAC}" -/opt/onos/bin/onos "externalgateway-update -m ${GW_MAC}" -EOF -EOI - -} 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}" \ |