Added example, apt install refactor

examples/init.pp

@@ -1,12 +0,0 @@
-# The baseline for module testing used by Puppet Labs is that each manifest
-# should have a corresponding test manifest that declares that class or defined
-# type.
-#
-# Tests are then run by using puppet apply --noop (to check for compilation
-# errors and view a log of events) or by fully applying the test in a virtual
-# environment (to compare the resulting system state to the desired state).
-#
-# Learn more about module testing here:
-# http://docs.puppetlabs.com/guides/tests_smoke.html
-#
-include qdr

lib/puppet/provider/qdr_listener/qdmanage.rb

@@ -29,7 +29,7 @@ Puppet::Type.type(:qdr_listener).provide(:qdmanage) do
     listener_properties[:addr]      = listener["addr"]
     listener_properties[:port]      = listener["port"]
     listener_properties[:role]      = listener["role"].to_s
-    listener_properties[:sasl_mechanisms] = listener["saslMechanisms"].to_s    
+    listener_properties[:sasl_mechanisms] = listener["saslMechanisms"].to_s
     listener_properties[:auth_peer] = listener["authenticatePeer"].to_s
     listener_properties[:require_encryption] = listener["requireEncryption"].to_s    
     listener_properties[:require_ssl] = listener["requireSsl"].to_s
@@ -46,8 +46,8 @@ Puppet::Type.type(:qdr_listener).provide(:qdmanage) do
                         :addr   => listener["addr"],
                         :port   => listener["port"],
                         :role   => listener["role"].to_s,
-                        :sasl_mechanisms => ["saslMechanisms"].to_s,
-                        :auth_peer => listener["authenticatePeer"].to_s,
+                        :sasl_mechanisms => listener["saslMechanisms"].to_s,
+                         :auth_peer => listener["authenticatePeer"].to_s,
                         :require_encryption => listener["requireEncryption"].to_s,
                         :require_ssl => listener["requireSsl"].to_s,
                         :max_frame_size => listener["maxFrameSize"].to_s)

lib/puppet/type/qdr_listener.rb

@@ -26,6 +26,7 @@ Puppet::Type.newtype(:qdr_listener) do
 
   newproperty(:sasl_mechanisms) do
     desc "List of accepted SASL authentication mechansisms"
+    defaultto "ANONYMOUS,DIGEST-MD5,EXTERNAL,PLAIN"
   end
 
   newproperty(:auth_peer) do

manifests/config.pp

@@ -8,7 +8,7 @@ class qdr::config inherits qdr {
   $service_config_template = $qdr::service_config_template
   $log_output              = $qdr::log_output
   
-  file { '/etc/qdrouterd' :
+  file { '/etc/qpid-dispatch' :
     ensure => directory,
     owner  => '0',
     group  => '0',

manifests/install.pp

@@ -8,25 +8,53 @@ class qdr::install inherits qdr {
   $package_provider   = $qdr::package_provider
   $sasl_package_list  = $qdr::sasl_package_list
   $tools_package_name = $qdr::tools_package_name
-  
-  package { $sasl_package_list :
-    ensure   => 'installed',
-    provider => $package_provider,
-  }
 
-  package { 'qdrouterd' :
-    ensure   => $package_ensure,
-    name     => $package_name,
-    provider => $package_provider,
-    notify   => Class['qdr::service'],
-    require  => Package[$sasl_package_list],
-  }
+  case $::osfamily{
+    'RedHat': {
+      package { $sasl_package_list :
+        ensure   => 'installed',
+        provider => $package_provider,
+      }
 
-  # (TODO:ansmith) should this have a require?
-  package { $tools_package_name :
-    ensure   => $package_ensure,
-    name     => $tools_package_name,
-    provider => $package_provider,
+      package { $package_name :
+        ensure   => $package_ensure,
+        provider => $package_provider,
+        notify   => Class['qdr::service'],
+        require  => Package[$sasl_package_list],
+      }
+
+      # (TODO:ansmith) should this have a require?
+      package { $tools_package_name :
+        ensure   => 'installed',
+        provider => $package_provider,
+        require  => Package[$package_name],
+      }
+    }
+    'Debian': {
+      include apt
+
+      Class['apt::update'] -> Package<| provider == 'apt' |>
+
+      apt::ppa { 'ppa:qpid/testing' : }
+
+      package { 'qdrouterd' :
+        ensure   => 'running',
+        name     => 'qdrouterd',
+        provider => apt
+      }
+
+      package { 'qdmanage' :
+        ensure   => 'installed',
+        provider => apt
+      }
+
+      package { 'qdstat' :
+        ensure   => 'installed',
+        provider => apt
+      }
+    }
+    default: {
+      fail("The ${module_name} module is not supported on an ${::osfamily}."
+    }
   }
-  
 }

manifests/params.pp

@@ -6,7 +6,7 @@ class qdr::params {
 
   case $::osfamily {
     'RedHat': {
-      $package_ensure     = 'installed'
+      $package_ensure     = 'running'
 
       $package_name       = 'qpid-dispatch-router'
       $service_name       = 'qdrouterd'
@@ -19,7 +19,7 @@ class qdr::params {
       $tools_package_name = 'qpid-dispatch-tools'
     }
     'Debian': {
-      $package_ensure     = 'installed'
+      $package_ensure     = 'running'
       $package_name       = 'qdrouterd'
       $service_name       = 'qdrouterd'
       $package_provider   = 'apt'
@@ -77,6 +77,6 @@ class qdr::params {
   # log parameters
   $log_module           = 'DEFAULT'
   $log_enable           = 'debug+'
-  $log_output           = 'var/log/qdrouterd.log'
+  $log_output           = '/var/log/qdrouterd.log'
 
 }