Fixes default features for Karaf 4

Only 'standard', 'wrap', and 'ssh' are now
required with Karaf 4 releases.

Change-Id: Ieecc1e45712c918e8da602241f7f7d6a695c7afb
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/manifests/params.pp b/manifests/params.pp
index 9c90cb8c453442fb1930eb8ecb04b47a53dff2a9..5790a842c2eae31196903aa5d181776886ca5724 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -8,7 +8,7 @@ class opendaylight::params {
   #   spec/classes/opendaylight_spec.rb tests that use default Karaf features
   # Else, both the Beaker and RSpec tests will fail
   # TODO: Remove this possible source of bugs^^
-  $default_features = ['config', 'standard', 'region', 'package', 'kar', 'ssh', 'management']
+  $default_features = ['standard', 'wrap', 'ssh']
   $extra_features = []
   $odl_rest_port = '8080'
   $odl_bind_ip = '0.0.0.0'

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a30c70870bbc75ed2a9af109129ea0d2a7d968de..a348d17a53b6b59c7e0bef1064aa31cf75adfaff 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -85,7 +85,7 @@ def karaf_feature_tests(options = {})
   # Extract params
   # NB: This default list should be the same as the one in opendaylight::params
   # TODO: Remove this possible source of bugs^^
-  default_features = options.fetch(:default_features, ['config', 'standard', 'region', 'package', 'kar', 'ssh', 'management'])
+  default_features = options.fetch(:default_features, ['standard', 'wrap', 'ssh'])
   extra_features = options.fetch(:extra_features, [])
 
   # The order of this list concat matters

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 04cf2b5e41d94476242c7ae8a6591199d8d71854..46b2b6302d739e45963233f4df7144ad5c4d90ca 100644 (file)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -52,8 +52,7 @@ def install_odl(options = {})
   # TODO: Remove this possible source of bugs^^
   # Extract params if given, defaulting to odl class defaults if not
   extra_features = options.fetch(:extra_features, [])
-  default_features = options.fetch(:default_features,
-    ['config', 'standard', 'region', 'package', 'kar', 'ssh', 'management'])
+  default_features = options.fetch(:default_features, ['standard', 'wrap', 'ssh'])
   odl_rest_port = options.fetch(:odl_rest_port, 8080)
   odl_bind_ip = options.fetch(:odl_bind_ip, '0.0.0.0')
   log_levels = options.fetch(:log_levels, {})
@@ -226,8 +225,7 @@ def karaf_config_validations(options = {})
   #   class, which are defined in opendaylight::params
   # TODO: Remove this possible source of bugs^^
   extra_features = options.fetch(:extra_features, [])
-  default_features = options.fetch(:default_features, ['config', 'standard', 'region',
-                                  'package', 'kar', 'ssh', 'management'])
+  default_features = options.fetch(:default_features, ['standard', 'wrap', 'ssh'])
 
   # Create one list of all of the features
   features = default_features + extra_features