Removing the work around jolokia and it's config file(s)

the current method for bringing jolokia in to OpenDaylight is just to
install the feature "odl-jolokia". This is probably something to be done
on a use-case basis and not added to the default features list.

Change-Id: I0430fcca2a5c59952c99ecbc6705629cbfdfa914
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 19fc02b362887020f26cc0b6feaad9666f27aa01..acae82c86a4ad148a8655bf55d8090c85a1d69a9 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -205,7 +205,7 @@ def enable_ha_tests(options = {})
   # HA_NODE_IPS size
   ha_node_count = ha_node_ips.size
 
-  if enable_ha
+  if (enable_ha) && (ha_node_count < 2)
     # Check for HA_NODE_COUNT < 2
     fail("Number of HA nodes less than 2: #{ha_node_count} and HA Enabled")
   end

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 8f757f0bdc0c5894b165e88295b9e29ea1dbfbb7..7f1d30dd0ea3146e6bbdd8bc1acf01a301ebe8f8 100644 (file)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -288,7 +288,7 @@ def enable_ha_validations(options = {})
   # HA_NODE_IPS size
   ha_node_count = ha_node_ips.size
 
-  if enable_ha
+  if (enable_ha) && (ha_node_count < 2)
     # Check for HA_NODE_COUNT < 2
     fail("Number of HA nodes less than 2: #{ha_node_count} and HA Enabled")
   end