From 13270af7908e9c1d71668e7ea8947ee4f2a97b60 Mon Sep 17 00:00:00 2001 From: Tim Rozet 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 --- spec/classes/tripleo_profile_base_neutron_opendaylight_spec.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'spec/classes') diff --git a/spec/classes/tripleo_profile_base_neutron_opendaylight_spec.rb b/spec/classes/tripleo_profile_base_neutron_opendaylight_spec.rb index 1eb79ae..b6082a6 100644 --- a/spec/classes/tripleo_profile_base_neutron_opendaylight_spec.rb +++ b/spec/classes/tripleo_profile_base_neutron_opendaylight_spec.rb @@ -18,8 +18,7 @@ require 'spec_helper' describe 'tripleo::profile::base::neutron::opendaylight' do let :params do - { :step => 1, - :node_name => 'overcloud-controller-0', + { :step => 1 } end shared_examples_for 'tripleo::profile::base::neutron::opendaylight' do @@ -69,8 +68,7 @@ describe 'tripleo::profile::base::neutron::opendaylight' do it 'should install and configure OpenDaylight in HA' do is_expected.to contain_class('opendaylight').with( :enable_ha => true, - :ha_node_ips => params[:odl_api_ips], - :ha_node_index => '1', + :ha_node_ips => params[:odl_api_ips] ) end end -- cgit 1.2.3-korg