Merge "Enable OpenDaylight clustering mode for FDIO scenarios"

3 files changed, 0 insertions, 55 deletions

diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 4a6738b3..d61c1f2e 100755
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -113,7 +113,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "cd /root/quagga; packages=\$(ls |grep -vE 'debuginfo|devel|contrib'); yum -y install \$packages" \
     --run-command "sudo usermod -a -G quaggavt quagga" \
     --upload ${BUILD_ROOT}/patches/neutron-patch-NSDriver.patch:/usr/lib/python2.7/site-packages/ \
-    --upload ${BUILD_ROOT}/patches/disable_odl_clustering.patch:/etc/puppet/modules/tripleo/ \
     --upload ${CACHE_DIR}/odl-netvirt-vpp-distribution.tar.gz:/root/ \
     -a overcloud-full-opendaylight_build.qcow2
 
diff --git a/build/patches/disable_odl_clustering.patch b/build/patches/disable_odl_clustering.patch
deleted file mode 100644
index 151481fc..00000000
--- a/build/patches/disable_odl_clustering.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/manifests/profile/base/neutron/opendaylight.pp b/manifests/profile/base/neutron/opendaylight.pp
-index 3269f3e..556fe63 100644
---- a/manifests/profile/base/neutron/opendaylight.pp
-+++ b/manifests/profile/base/neutron/opendaylight.pp
-@@ -22,34 +22,19 @@
- #   (Optional) The current step of the deployment
- #   Defaults to hiera('step')
- #
--# [*odl_api_ips*]
--#   (Optional) List of OpenStack Controller IPs for ODL API
--#   Defaults to hiera('opendaylight_api_node_ips')
--#
--# [*node_name*]
--#   (Optional) The short hostname of node
--#   Defaults to hiera('bootstack_nodeid')
-+# [*primary_node*]
-+#   (Optional) The hostname of the first node of this role type
-+#   Defaults to hiera('bootstrap_nodeid', undef)
- #
- class tripleo::profile::base::neutron::opendaylight (
-   $step         = hiera('step'),
--  $odl_api_ips  = hiera('opendaylight_api_node_ips'),
--  $node_name    = hiera('bootstack_nodeid')
-+  $primary_node = hiera('bootstrap_nodeid', undef),
- ) {
- 
-   if $step >= 1 {
--    if empty($odl_api_ips) {
--      fail('No IPs assigned to OpenDaylight Api Service')
--    } elsif size($odl_api_ips) == 2 {
--      fail('2 node OpenDaylight deployments are unsupported.  Use 1 or greater than 2')
--    } elsif size($odl_api_ips) > 2 {
--      $node_string = split($node_name, '-')
--      $ha_node_index = $node_string[-1] + 1
--      class { '::opendaylight':
--        enable_ha     => true,
--        ha_node_ips   => $odl_api_ips,
--        ha_node_index => $ha_node_index,
--      }
--    } else {
-+    # Configure ODL only on first node of the role where this service is
-+    # applied
-+    if $primary_node == downcase($::hostname) {
-       include ::opendaylight
-     }
-   }
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index d219e148..9017d3b1 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -182,14 +182,6 @@ EOI
                                                -a overcloud-full.qcow2
 EOI
 
-    # Disable clustering for ODL FDIO HA scenarios
-    if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' ]]; then
-      ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
-      LIBGUESTFS_BACKEND=direct virt-customize --run-command "cd /etc/puppet/modules/tripleo/ && patch -p1 < disable_odl_clustering.patch" \
-                                               -a overcloud-full.qcow2
-EOI
-    fi
-
     # Configure routing node for odl-fdio
     if [[ "${deploy_options_array['sdn_l3']}" == 'True' ]]; then
       ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI