Update ensurable for qdr types and directory

These updates were found to be necessary for puppet-opentstack-integration
scenario to run succesfully.

This patch:
*pass block to ensurable for qdr types
*add routerd log directory

Change-Id: If06b558ac6c1b2a926b10de389e6af23cec84d28
This commit is contained in:
Andrew Smith 2017-07-28 13:13:53 -04:00
parent a48d12200a
commit 537c1b23d5
7 changed files with 68 additions and 9 deletions

View File

@ -1,7 +1,15 @@
Puppet::Type.newtype(:qdr_address) do
desc "Type for managing qdrouterd address prefixes for distribution and phasing"
ensurable
ensurable do
defaultto(:present)
newvalue(:present) do
provider.create
end
newvalue(:absent) do
provider.destroy
end
end
autorequire(:service) { 'qdrouterd' }

View File

@ -1,7 +1,15 @@
Puppet::Type.newtype(:qdr_connector) do
desc "Type for managing qdrouterd connection instances"
ensurable
ensurable do
defaultto(:present)
newvalue(:present) do
provider.create
end
newvalue(:absent) do
provider.destroy
end
end
autorequire(:service) { 'qdrouterd' }

View File

@ -1,7 +1,15 @@
Puppet::Type.newtype(:qdr_listener) do
desc "Type for managing qdrouterd listener instances"
ensurable
ensurable do
defaultto(:present)
newvalue(:present) do
provider.create
end
newvalue(:absent) do
provider.destroy
end
end
autorequire(:service) { 'qdrouterd' }

View File

@ -1,7 +1,15 @@
Puppet::Type.newtype(:qdr_log) do
desc "Type for managing qdrouterd module log instances"
ensurable
ensurable do
defaultto(:present)
newvalue(:present) do
provider.create
end
newvalue(:absent) do
provider.destroy
end
end
autorequire(:service) { 'qdrouterd' }

View File

@ -1,7 +1,15 @@
Puppet::Type.newtype(:qdr_user) do
desc "Type for managing qdr users such as with sasl provider, etc."
ensurable
ensurable do
defaultto(:present)
newvalue(:present) do
provider.create
end
newvalue(:absent) do
provider.destroy
end
end
autorequire(:service) { 'qdrouterd' }

View File

@ -7,13 +7,14 @@ class qdr::config inherits qdr {
$service_config_path = $::qdr::params::service_config_path
$service_home = $::qdr::params::service_home
$log_output = $::qdr::log_output
$router_debug_dump = $::qdr::router_debug_dump
$service_config_template = 'qdr/qdrouterd.conf.erb'
file { $service_home :
ensure => directory,
owner => '0',
group => '0',
mode => '0644',
mode => '0755',
}
file { '/etc/qpid-dispatch' :
@ -40,6 +41,13 @@ class qdr::config inherits qdr {
notify => Class['qdr::service'],
}
file { $router_debug_dump :
ensure => directory,
owner => '0',
group => '0',
mode => '0766',
}
file { $log_output :
ensure => file,
owner => '0',

View File

@ -23,7 +23,7 @@ describe 'qdr' do
:ensure => :directory,
:owner => '0',
:group => '0',
:mode => '0644',
:mode => '0755',
})
end
@ -54,6 +54,15 @@ describe 'qdr' do
})
end
it do
should contain_file(platform_params[:router_debug_dump]).with({
:ensure => :directory,
:owner => '0',
:group => '0',
:mode => '0766',
})
end
it do
should contain_service(platform_params[:service_name]).with({
:ensure => 'running',
@ -139,14 +148,16 @@ describe 'qdr' do
{ :qdr_package_name => 'qdrouterd',
:service_name => 'qdrouterd',
:sasl_package_list => ['sasl2-bin'],
:service_home => '/var/lib/qdrouterd'}
:service_home => '/var/lib/qdrouterd',
:router_debug_dump => '/var/log/qdrouterd'}
end
when 'RedHat'
let (:platform_params) do
{ :qdr_package_name => 'qpid-dispatch-router',
:service_name => 'qdrouterd',
:sasl_package_list => ['cyrus-sasl-lib','cyrus-sasl-plain'],
:service_home => '/var/lib/qdrouterd'}
:service_home => '/var/lib/qdrouterd',
:router_debug_dump => '/var/log/qdrouterd'}
end
end