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: Iad6c3a832744acb8c832c37e10ca259836333932
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/README.markdown b/README.markdown
index 6a8a03600edecef21593d80a86f5c440590dc62d..27e76fa0826077bb72a099d30e29f25a538ffa6e 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -328,7 +328,7 @@ Valid options: The boolean values `true` and `false`.
 
 Requires: `ha_node_ips`, `ha_node_index`
 
-The ODL OVSDB Clustering and Jolokia XML for HA are configured and enabled.
+The ODL OVSDB Clustering XML for HA are configured and enabled.
 
 ##### `ha_node_ips`
 

diff --git a/files/jolokia.xml b/files/jolokia.xml
deleted file mode 100644 (file)
index 42dc668..0000000
--- a/files/jolokia.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="jolokia-1.1.5">
-    <feature name="feature-jolokia" version="1.1.5" install="auto">
-       <bundle>mvn:org.jolokia/jolokia-osgi/1.1.5</bundle>
-    </feature>
-</features>

diff --git a/manifests/config.pp b/manifests/config.pp
index afe52e8a035e047d3ad5b897f4a25571f9d55de8..4e6ddd697a0128b94701387c6d0b87ba4eda7cdf 100644 (file)
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -45,16 +45,6 @@ class opendaylight::config {
   $ha_node_count = count($::opendaylight::ha_node_ips)
   if $::opendaylight::enable_ha {
     if $ha_node_count >= 2 {
-      # Configuration Jolokia XML for HA
-      file { 'opendaylight/jolokia.xml':
-        ensure => file,
-        path   => '/opt/opendaylight/deploy/jolokia.xml',
-        # Set user:group owners
-        owner  => 'odl',
-        group  => 'odl',
-        source => 'puppet:///modules/opendaylight/jolokia.xml',
-      }
-
       # Configure ODL OSVDB Clustering
       $ha_node_ip_str = join($::opendaylight::ha_node_ips, ' ')
       exec { 'Configure ODL OVSDB Clustering':

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0cf284553350d76bf2bc71cba76190b311adbec5..19fc02b362887020f26cc0b6feaad9666f27aa01 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -206,21 +206,8 @@ def enable_ha_tests(options = {})
   ha_node_count = ha_node_ips.size
 
   if enable_ha
-    # Confirm ODL OVSDB HA is enabled
-    if ha_node_count >=2
-      # Check for HA_NODE_COUNT >= 2
-      it {
-        should contain_file('opendaylight/jolokia.xml').with(
-          'ensure'  => 'file',
-          'path'  => '/opt/opendaylight/deploy/jolokia.xml',
-          'owner' => 'odl',
-          'group' => 'odl'
-        )
-      }
-    else
-      # Check for HA_NODE_COUNT < 2
-      fail("Number of HA nodes less than 2: #{ha_node_count} and HA Enabled")
-    end
+    # Check for HA_NODE_COUNT < 2
+    fail("Number of HA nodes less than 2: #{ha_node_count} and HA Enabled")
   end
 end
 

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index ce56f4bbc8ed5ab6504d4fc3ac8f8441ed4f8a70..8f757f0bdc0c5894b165e88295b9e29ea1dbfbb7 100644 (file)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -289,18 +289,8 @@ def enable_ha_validations(options = {})
   ha_node_count = ha_node_ips.size
 
   if enable_ha
-    # Confirm ODL OVSDB HA is enabled
-    if ha_node_count >=2
-      # Check for HA_NODE_COUNT >= 2
-      describe file('/opt/opendaylight/deploy/jolokia.xml') do
-      it { should be_file }
-      it { should be_owned_by 'odl' }
-      it { should be_grouped_into 'odl' }
-    end
-    else
-      # Check for HA_NODE_COUNT < 2
-      fail("Number of HA nodes less than 2: #{ha_node_count} and HA Enabled")
-    end
+    # Check for HA_NODE_COUNT < 2
+    fail("Number of HA nodes less than 2: #{ha_node_count} and HA Enabled")
   end
 end