summaryrefslogtreecommitdiffstats
path: root/build/patches/disable_odl_clustering.patch
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-05-04 18:22:25 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-04 18:22:25 +0000
commitfcd5a75810ed9167baf6e5da4ab20b59f7ab1de4 (patch)
treee1cf26f390f4bcba0f2acbd5e0cf2aa7f89fc54d /build/patches/disable_odl_clustering.patch
parent8593a68f1ec8ccd248cfcdd46a2a887a0eeafb6c (diff)
parente588f35864c32c7a28f8efdcf5f69ace5020842b (diff)
Merge "Enable OpenDaylight clustering mode for FDIO scenarios"
Diffstat (limited to 'build/patches/disable_odl_clustering.patch')
-rw-r--r--build/patches/disable_odl_clustering.patch46
1 files changed, 0 insertions, 46 deletions
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
- }
- }