11 files changed, 45 insertions, 5 deletions
diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec
index 5e1a9b36..854fbbb6 100644
--- 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/opnfv-environment.yaml b/build/opnfv-environment.yaml
index 7a3ae739..0f841529 100644
--- a/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@ -3,8 +3,10 @@
 
 parameters:
   controllerImage: overcloud-full
-  OvercloudControlFlavor: baremetal
+  OvercloudControlFlavor: control
+  OvercloudComputeFlavor: compute
   ControllerEnableSwiftStorage: false
+#  CloudDomain:
   EnableSahara: false
   ExtraConfig:
     tripleo::ringbuilder::build_ring: False
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 4f8a3ff0..3e403bbc 100755
--- 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 73542c8c..1cb61d37 100644
--- a/ci/PR_revision.log
+++ b/ci/PR_revision.log
@@ -14,3 +14,4 @@
 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
diff --git a/config/deploy/os-odl_l2-bgpvpn-ha.yaml b/config/deploy/os-odl_l2-bgpvpn-ha.yaml
new file mode 100644
index 00000000..73507772
--- /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/config/network/network_settings.yaml b/config/network/network_settings.yaml
index 7c0f5018..f7680643 100644
--- a/config/network/network_settings.yaml
+++ b/config/network/network_settings.yaml
@@ -22,6 +22,9 @@
 # DNS Servers for all nodes, comma delimited list
 dns_servers: ["8.8.8.8", "8.8.4.4"]
 
+# Domain name to use for undercloud/overcloud nodes
+domain_name: 'opnfvapex.com'
+
 # "admin" is the short name for Control Plane Network.
 # During OPNFV deployment it is used for node provisioning so
 # PXE boot should be enabled for the related interfaces on all
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 3cb2826c..0c3f9d44 100755
--- 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
@@ -183,9 +185,8 @@ EOI
      DEPLOY_OPTIONS+=" --ntp-server $ntp_server"
   fi
 
-  if [[ ! "$virtual" == "TRUE" ]]; then
-     DEPLOY_OPTIONS+=" --control-flavor control --compute-flavor compute"
-  else
+  DEPLOY_OPTIONS+=" --control-flavor control --compute-flavor compute"
+  if [[ "$virtual" == "TRUE" ]]; then
      DEPLOY_OPTIONS+=" -e virtual-environment.yaml"
   fi
 
@@ -234,6 +235,7 @@ for dns_server in ${dns_servers}; do
   dns_server_ext="\${dns_server_ext} --dns-nameserver \${dns_server}"
 done
 neutron subnet-update \$(neutron subnet-list | grep -Ev "id|tenant|external|storage" | grep -v \\\\-\\\\- | awk {'print \$2'}) \${dns_server_ext}
+sed -i '/CloudDomain:/c\  CloudDomain: '${domain_name} opnfv-environment.yaml
 echo "Executing overcloud deployment, this should run for an extended period without output."
 sleep 60 #wait for Hypervisor stats to check-in to nova
 # save deploy command so it can be used for debugging
diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh
index ec2ca89f..8ccd896f 100755
--- 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/python/apex/common/constants.py b/lib/python/apex/common/constants.py
index dfed33f8..996ef2f0 100644
--- a/lib/python/apex/common/constants.py
+++ b/lib/python/apex/common/constants.py
@@ -16,3 +16,4 @@ OPNFV_NETWORK_TYPES = [ADMIN_NETWORK, PRIVATE_NETWORK, PUBLIC_NETWORK,
                        STORAGE_NETWORK, API_NETWORK]
 DNS_SERVERS = ["8.8.8.8", "8.8.4.4"]
 ROLES = ['compute', 'controller']
+DOMAIN_NAME = 'localdomain.com'
diff --git a/lib/python/apex/network_settings.py b/lib/python/apex/network_settings.py
index fd6c1455..f2807664 100644
--- a/lib/python/apex/network_settings.py
+++ b/lib/python/apex/network_settings.py
@@ -75,6 +75,8 @@ class NetworkSettings:
 
         self.settings_obj['dns_servers'] = self.settings_obj.get(
             'dns_servers', constants.DNS_SERVERS)
+        self.settings_obj['domain_name'] = self.settings_obj.get(
+            'domain_name', constants.DOMAIN_NAME)
 
     def _validate_overcloud_nic_order(self, network):
         """
@@ -281,6 +283,8 @@ class NetworkSettings:
             dns_list = dns_list + "{} ".format(dns_server)
         dns_list = dns_list.strip()
         bash_str += "dns_servers=\'{}\'\n".format(dns_list)
+        bash_str += "domain_name=\'{}\'\n".format(self.settings_obj[
+                                                  'domain_name'])
         if path:
             with open(path, 'w') as file:
                 file.write(bash_str)
diff --git a/lib/undercloud-functions.sh b/lib/undercloud-functions.sh
index f829e980..f1c42865 100755
--- a/lib/undercloud-functions.sh
+++ b/lib/undercloud-functions.sh
@@ -211,6 +211,7 @@ if [[ "$net_isolation_enabled" == "TRUE" ]]; then
   openstack-config --set undercloud.conf DEFAULT dhcp_end ${admin_network_dhcp_range##*,}
   openstack-config --set undercloud.conf DEFAULT inspection_iprange ${admin_network_introspection_range}
   openstack-config --set undercloud.conf DEFAULT undercloud_debug false
+  openstack-config --set undercloud.conf DEFAULT undercloud_hostname "undercloud.${domain_name}"
 
 fi
 
@@ -236,8 +237,18 @@ openstack undercloud install &> apex-undercloud-install.log || {
 
 sleep 30
 sudo systemctl restart openstack-glance-api
+# Set nova domain name
+sudo openstack-config --set /etc/nova/nova.conf DEFAULT dns_domain ${domain_name}
+sudo openstack-config --set /etc/nova/nova.conf DEFAULT dhcp_domain ${domain_name}
 sudo systemctl restart openstack-nova-conductor
 sudo systemctl restart openstack-nova-compute
+sudo systemctl restart openstack-nova-api
+sudo systemctl restart openstack-nova-scheduler
+
+# Set neutron domain name
+sudo openstack-config --set /etc/neutron/neutron.conf DEFAULT dns_domain ${domain_name}
+sudo systemctl restart neutron-server
+sudo systemctl restart neutron-dhcp-agent
 
 sudo sed -i '/num_engine_workers/c\num_engine_workers = 2' /etc/heat/heat.conf
 sudo sed -i '/#workers\s=/c\workers = 2' /etc/heat/heat.conf