diff options
| author |   Tim Rozet <tdrozet@gmail.com> | 2017-07-21 12:59:57 -0400 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2017-07-21 13:02:51 -0400 |
| commit | 13270af7908e9c1d71668e7ea8947ee4f2a97b60 (patch) | |
| tree | ffc68c691f58c23825222ed813a9a94b972f0218 /manifests/profile/base/neutron/opendaylight.pp | |
| parent | d47c6ae05c7e22ae937d0c0e5e57ec145a692536 (diff) | |
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>
Diffstat (limited to 'manifests/profile/base/neutron/opendaylight.pp')
| -rw-r--r-- | manifests/profile/base/neutron/opendaylight.pp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/manifests/profile/base/neutron/opendaylight.pp b/manifests/profile/base/neutron/opendaylight.pp index 7a35b6b..796d63e 100644 --- a/manifests/profile/base/neutron/opendaylight.pp +++ b/manifests/profile/base/neutron/opendaylight.pp @@ -33,7 +33,6 @@ class tripleo::profile::base::neutron::opendaylight ( $step = Integer(hiera('step')), $odl_api_ips = hiera('opendaylight_api_node_ips'), - $node_name = hiera('bootstrap_nodeid') ) { if $step >= 1 { @@ -43,12 +42,9 @@ class tripleo::profile::base::neutron::opendaylight ( } 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, + enable_ha => true, + ha_node_ips => $odl_api_ips, } } else { include ::opendaylight |