Merge "Adding tacker support"

diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec
index 5e1a9b3..854fbbb 100644 (file)
--- a/build/opnfv-apex-common.spec
+++ b/build/opnfv-apex-common.spec
@@ -41,6 +41,7 @@ install config/deploy/os-nosdn-performance-ha.yaml %{buildroot}%{_sysconfdir}/op
 install config/deploy/os-nosdn-ovs-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-ha.yaml
 install config/deploy/os-odl_l2-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml
 install config/deploy/os-odl_l2-sfc-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.yaml
+install config/deploy/os-odl_l2-bgpvpn-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-bgpvpn-ha.yaml
 install config/deploy/os-odl_l2-fdio-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-ha.yaml
 install config/deploy/os-odl_l2-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-noha.yaml
 install config/deploy/os-odl_l3-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml
@@ -109,6 +110,7 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
 %{_sysconfdir}/opnfv-apex/os-nosdn-ovs-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl_l2-bgpvpn-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml

diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 4f8a3ff..3e403bb 100755 (executable)
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -36,6 +36,9 @@ enabled=1
 gpgcheck=0
 EOF
 
+# SDNVPN - Copy tunnel setup script
+wget https://raw.githubusercontent.com/openstack/fuel-plugin-opendaylight/brahmaputra-sr2/deployment_scripts/puppet/modules/opendaylight/templates/setup_TEPs.py
+
 # install ODL packages
 # install Jolokia for ODL HA
 # Patch in OPNFV custom puppet-tripleO
@@ -47,6 +50,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --install https://github.com/michaeltchapman/networking_rpm/raw/master/openstack-neutron-bgpvpn-2015.2-1.el7.centos.noarch.rpm \
     --run-command "wget https://github.com/rhuss/jolokia/releases/download/v1.3.3/jolokia-1.3.3-bin.tar.gz -O /tmp/jolokia-1.3.3-bin.tar.gz" \
     --run-command "tar -xvf /tmp/jolokia-1.3.3-bin.tar.gz -C /opt/opendaylight/system/org" \
+    --upload ./setup_TEPs.py:/tmp \
     -a overcloud-full-opendaylight_build.qcow2
 
     # Move these two lines above the -a overcloud-full-opendaylight_build.qcow2 when the patch has been rebased

diff --git a/ci/PR_revision.log b/ci/PR_revision.log
index 73542c8..de684ef 100644 (file)
--- a/ci/PR_revision.log
+++ b/ci/PR_revision.log
@@ -14,3 +14,5 @@
 38,Fixes nova default floating pool to be 'external'
 39,removing extra whitespace from congress parameter
 40,Move mongo to step 1
+42, congress typo
+44,Fixes nova host/ip bug

diff --git a/ci/util.sh b/ci/util.sh
index ad7f078..f48dcd7 100755 (executable)
--- a/ci/util.sh
+++ b/ci/util.sh
@@ -5,7 +5,7 @@
 CONFIG=${CONFIG:-'/var/opt/opnfv'}
 RESOURCES=${RESOURCES:-"$CONFIG/images"}
 LIB=${LIB:-"$CONFIG/lib"}
-VALID_CMDS="undercloud overcloud debug-stack -h --help"
+VALID_CMDS="undercloud overcloud opendaylight debug-stack -h --help"
 
 source $LIB/utility-functions.sh
 
@@ -27,6 +27,8 @@ display_usage() {
   echo -e "                                     user    Optional: Defaults to 'stack'\n"
   echo -e "                                     command Optional: Defaults to none\n"
   echo -e ""
+  echo -e "   opendaylight                      Connect to OpenDaylight Karaf console\n"
+  echo -e ""
   echo -e "   overcloud  [ node [ command ] ]   Connect to an Overcloud node and optionally execute a command\n"
   echo -e "                                     node    Required: in format controller|compute<number>.  Example: controller0\n"
   echo -e "                                     command Optional: Defaults to none\n"
@@ -79,6 +81,10 @@ parse_cmdline() {
                 fi
                 exit 0
             ;;
+        opendaylight)
+                opendaylight_connect
+                exit 0
+            ;;
         debug-stack)
                 undercloud_connect stack "$(typeset -f debug_stack); debug_stack"
                 exit 0

diff --git a/config/deploy/os-odl_l2-bgpvpn-ha.yaml b/config/deploy/os-odl_l2-bgpvpn-ha.yaml
new file mode 100644 (file)
index 0000000..7350777
--- /dev/null
+++ b/config/deploy/os-odl_l2-bgpvpn-ha.yaml
@@ -0,0 +1,10 @@
+global_params:
+  ha_enabled: true
+
+deploy_options:
+  sdn_controller: opendaylight
+  sdn_l3: false
+  tacker: false
+  congress: false
+  sfc: false
+  vpn: true

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index b035422..14c3724 100755 (executable)
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -20,6 +20,8 @@ function overcloud_deploy {
       DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sdnvpn.yaml"
     elif [ "${deploy_options_array['vpp']}" == 'True' ]; then
       DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_fdio.yaml"
+    elif [ "${deploy_options_array['vpn']}" == 'true' ]; then
+      DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sdnvpn.yaml"
     else
       DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight.yaml"
     fi
@@ -203,6 +205,10 @@ fi
 
 source stackrc
 set -o errexit
+# Workaround for APEX-207 where sometimes swift proxy is down
+if ! sudo systemctl status openstack-swift-proxy > /dev/null; then
+  sudo systemctl restart openstack-swift-proxy
+fi
 echo "Uploading overcloud glance images"
 openstack overcloud image upload
 

diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh
index d0f4da4..af72d8f 100755 (executable)
--- a/lib/post-install-functions.sh
+++ b/lib/post-install-functions.sh
@@ -67,7 +67,7 @@ EOI
   # TODO fix this when HA SDN controllers are supported
   if [ "${deploy_options_array['sdn_controller']}" != 'False' ]; then
     echo -e "${blue}INFO: Finding SDN Controller IP for overcloudrc...${reset}"
-    sdn_controller_ip=$(overcloud_connect controller0 "facter ipaddress_br_ex")
+    sdn_controller_ip=$(undercloud_connect stack "source stackrc;nova list | grep controller-0 | cut -d '|' -f 7 | grep -Eo [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+")
     echo -e "${blue}INFO: SDN Controller IP is ${sdn_controller_ip} ${reset}"
     undercloud_connect stack "echo 'export SDN_CONTROLLER_IP=${sdn_controller_ip}' >> /home/stack/overcloudrc"
   fi

diff --git a/lib/utility-functions.sh b/lib/utility-functions.sh
index f73a2d8..bc9a959 100644 (file)
--- a/lib/utility-functions.sh
+++ b/lib/utility-functions.sh
@@ -61,6 +61,22 @@ controller<number> or compute<number>"
   fi
 }
 
+##connects to opendaylight karaf console
+##params: None
+function opendaylight_connect {
+  local opendaylight_ip
+  opendaylight_ip=$(undercloud_connect "stack" "cat overcloudrc | grep SDN_CONTROLLER_IP | grep -Eo [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+")
+
+  if [ "$opendaylight_ip" == "" ]; then
+    echo -e "Unable to find IP for OpenDaylight in overcloudrc"
+    return 1
+  else
+    echo -e "Connecting to ODL Karaf console.  Default password is 'karaf'"
+  fi
+
+  ssh -p 8101 ${SSH_OPTIONS[@]} karaf@${opendaylight_ip}
+}
+
 ##outputs heat stack deployment failures
 ##params: none
 function debug_stack {