clean up configmethod a bit, another defined type abstraction

manifests/kafka/config.pp

@@ -2,14 +2,9 @@
 
 ) {
 
-  $server_propertyfile = '/etc/kafka/server.properties'
-
-  $keys = keys(merge({}, $::confluent::kafka_server_properties))
-
-  confluent::property { $keys:
-    propertyfile => $server_propertyfile,
-    component    => 'kafkaserver',
-    settingshash => $::confluent::kafka_server_properties,
+  ::confluent::propertyfile { '/etc/kafka/server.properties':
+    propertyhash => $::confluent::kafka_server_properties,
+    component    => 'kafka-server',
   }
 
 }

manifests/propertyfile.pp

@@ -0,0 +1,15 @@
+define confluent::propertyfile (
+  $propertyhash,
+  $component,
+) {
+
+  $keys = keys(merge({}, $propertyhash))
+
+  ::confluent::property { $keys:
+    propertyfile => $name,
+    component    => $component,
+    settingshash => $propertyhash,
+  }
+
+
+}

manifests/restservice/config.pp

@@ -1,13 +1,8 @@
 class confluent::restservice::config {
 
-  $restservice_propertyfile = '/etc/kafka-rest/kafka-rest.properties'
-
-  $keys = keys(merge({}, $::confluent::restservice_properties))
-
-  ::confluent::property { $keys:
-    propertyfile => $restservice_propertyfile,
+  ::confluent::propertyfile { '/etc/kafka-rest/kafka-rest.properties':
+    propertyhash => $::confluent::restservice_properties,
     component    => 'restservice',
-    settingshash => $::confluent::restservice_properties,
   }
 
 }

manifests/schemaregistry/config.pp

@@ -1,13 +1,8 @@
 class confluent::schemaregistry::config {
 
-  $schemaregistry_propertyfile = '/etc/schema-registry/schema-registry.properties'
-
-  $keys = keys(merge({}, $::confluent::schemaregistry_properties))
-
-  ::confluent::property { $keys:
-    propertyfile => $schemaregistry_propertyfile,
+  ::confluent::propertyfile { '/etc/schema-registry/schema-registry.properties':
+    propertyhash => $::confluent::schemaregistry_properties,
     component    => 'schemaregistry',
-    settingshash => $::confluent::schemaregistry_properties,
   }
 
 }

manifests/zookeeper/config.pp

@@ -1,13 +1,8 @@
 class confluent::zookeeper::config {
 
-  $zookeeper_propertyfile = '/etc/kafka/zookeeper.properties'
-
-  $keys = keys(merge({}, $::confluent::zookeeper_properties))
-
-  ::confluent::property { $keys:
-    propertyfile => $zookeeper_propertyfile,
+  ::confluent::propertyfile { '/etc/kafka/zookeeper.properties':
+    propertyhash =>$::confluent::zookeeper_properties,
     component    => 'zookeeper',
-    settingshash => $::confluent::zookeeper_properties,
   }
 
 }

spec/classes/confluent__kafka__config_spec.rb

@@ -5,6 +5,8 @@
   context 'with default values do' do
 
     it { should contain_class('confluent::kafka::config') }
+    it { should contain_confluent__propertyfile('/etc/kafka/server.properties') }
+
 
   end
 

spec/classes/confluent__propertyfile.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe 'confluent::propertyfile' do
+
+  context 'with default values for all parameters' do
+
+    it { should contain_class('confluent::propertyfile') }
+
+  end
+
+end

spec/classes/confluent__restservice__config_spec.rb

@@ -5,7 +5,7 @@
   context 'with default values do' do
 
     it { should contain_class('confluent::restservice::config') }
-    #it { should contain_file('/etc/kafka/kafka-rest-log4j.properties') }
+    it { should contain_confluent__propertyfile('/etc/kafka-rest/kafka-rest.properties') }
 
   end
 

spec/classes/confluent__schemaregistry__config_spec.rb

@@ -5,6 +5,7 @@
   context 'with default values do' do
 
     it { should contain_class('confluent::schemaregistry::config') }
+    it { should contain_confluent__propertyfile('/etc/schema-registry/schema-registry.properties') }
 
   end
 

spec/classes/confluent__zookeeper__config_spec.rb

@@ -5,6 +5,7 @@
   context 'with default values do' do
 
     it { should contain_class('confluent::zookeeper::config') }
+    it { should contain_confluent__propertyfile('/etc/kafka/zookeeper.properties') }
 
   end