From 13270af7908e9c1d71668e7ea8947ee4f2a97b60 Mon Sep 17 00:00:00 2001
From: Tim Rozet <tdrozet@gmail.com>
Date: Fri, 21 Jul 2017 12:59:57 -0400
Subject: Deprecates using exec workaround for ODL clustering

Previously we had used an exec defined in puppet-tripleo to do
clustering with OpenDaylight docker containers.  The clustering issue is
now fixed in puppet-opendaylight by:
https://git.opendaylight.org/gerrit/#/c/60491

So removing the custom function and class workaround.  Also,
'ha_node_index' is deprecated for configuring clustering with
puppet-opendaylight so that is also removed.

Depends-On: I21c1eb2eff6d4cb855eff4a1122f55ad625d84cc

Change-Id: I7693b692c74071945fdcc08292542e9b458a540b
Signed-off-by: Tim Rozet <trozet@redhat.com>
---
 .../base/neutron/opendaylight/configure_cluster.pp | 45 ----------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 manifests/profile/base/neutron/opendaylight/configure_cluster.pp

(limited to 'manifests/profile/base/neutron/opendaylight/configure_cluster.pp')

diff --git a/manifests/profile/base/neutron/opendaylight/configure_cluster.pp b/manifests/profile/base/neutron/opendaylight/configure_cluster.pp
deleted file mode 100644
index 022e8ae..0000000
--- a/manifests/profile/base/neutron/opendaylight/configure_cluster.pp
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2017 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-# Configures an OpenDaylight cluster.
-# It creates the akka configuration file for ODL to cluster correctly
-# It will not configure clustering if less than 3 nodes
-#
-# == Function: tripleo::profile::base::neutron::opendaylight::configure_cluster
-#
-# == Parameters
-#
-# [*node_name*]
-#   The short hostname of node
-#
-# [*odl_api_ips*] Array of IPs per ODL node
-#   Defaults to empty array
-#
-define tripleo::profile::base::neutron::opendaylight::configure_cluster(
-  $node_name,
-  $odl_api_ips = [],
-) {
-  validate_array($odl_api_ips)
-  if size($odl_api_ips) > 2 {
-    $node_string = split($node_name, '-')
-    $ha_node_index = $node_string[-1] + 1
-    $ha_node_ip_str = join($odl_api_ips, ' ')
-    exec { 'Configure ODL Clustering':
-      command => "configure_cluster.sh ${ha_node_index} ${ha_node_ip_str}",
-      path    => '/opt/opendaylight/bin/:/usr/sbin:/usr/bin:/sbin:/bin',
-      creates => '/opt/opendaylight/configuration/initial/akka.conf'
-    }
-  }
-}
-
-- 
cgit 1.2.3-korg