diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-03-27 11:54:39 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-03-27 23:12:53 +0000 |
| commit | b94ca9c7d72d7abbc3c011818eec125067c008b9 (patch) | |
| tree | e0f7cd916ba291362ee09935b569933997d49fae /build/patches | |
| parent | 33828db100ef502c8ef4eb66380d10a83a08d182 (diff) | |
Disables ODL clustering for FDIO+ODL scenarios
ODL clustering has issues with VPP mounting, so we are disabling
clustering for now and should have the bug in ODL fixed by Danube 2.0.
Change-Id: I19b9c9167596105a3197de8c5a537bed1280f241
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit 5108498adb2870581cc5a4bb99db693a05ff9c3b)
Diffstat (limited to 'build/patches')
| -rw-r--r-- | build/patches/disable_odl_clustering.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/build/patches/disable_odl_clustering.patch b/build/patches/disable_odl_clustering.patch new file mode 100644 index 00000000..151481fc --- /dev/null +++ b/build/patches/disable_odl_clustering.patch @@ -0,0 +1,46 @@ +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 + } + } |