openstack/puppet-pacemaker
Code Issues Proposed changes

Pacemaker misc fixes

Browse Source 
Add missing package, add mising parameters,
fix functions.

Change-Id: Ib885af7df8fc2b678272fe85e5d8bbdd9aa1988b
This commit is contained in:
Dmitry Ilyin 2016-05-31 03:04:25 +03:00
parent 102f55f039
commit 475b7ebcd0
5 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/puppet/parser/functions/pacemaker_cluster_nodes.rb
View File

@ -146,6 +146,7 @@ Output forms:
fail "Data is not a hash: #{hash.inspect}" unless hash.is_a? Hash fail "Data is not a hash: #{hash.inspect}" unless hash.is_a? Hash
node_list = [] node_list = []
hash.each do |node_name, node| hash.each do |node_name, node|
node = node.dup
node['name'] = node_name if node_name and not node['name'] node['name'] = node_name if node_name and not node['name']
node_hash = node_hash_process.call node node_hash = node_hash_process.call node
next unless node_hash['ring0'] or node_hash['ring1'] next unless node_hash['ring0'] or node_hash['ring1']

5
lib/puppet/parser/functions/pacemaker_resource_parameters.rb
View File

@ -4,7 +4,7 @@ module Puppet::Parser::Functions
type: :rvalue, type: :rvalue,
arity: -1, arity: -1,
doc: <<-eof doc: <<-eof
Gather resource parameters and their values Gather resource parameters and their values
eof eof
) do |args| ) do |args|
parameters = {} parameters = {}
@ -15,10 +15,11 @@ module Puppet::Parser::Functions
next if key.nil? next if key.nil?
next if value.nil? next if value.nil?
next if value == '' next if value == ''
next if value == :undef
key = key.to_s key = key.to_s
parameters.store key, value parameters.store key, value
end end
end end
parameters parameters
end end
end end

34
manifests/new.pp
View File

@ -15,23 +15,23 @@ class pacemaker::new (
$package_ensure = $::pacemaker::new::params::package_ensure, $package_ensure = $::pacemaker::new::params::package_ensure,
$package_provider = $::pacemaker::new::params::package_provider, $package_provider = $::pacemaker::new::params::package_provider,
$pcsd_mode = $::pacemaker::new::params::pcsd_mode, $pcsd_mode = $::pacemaker::new::params::pcsd_mode,
$cluster_nodes = $::pacemaker::new::params::cluster_nodes,
$cluster_nodes = $::pacemaker::new::params::cluster_nodes, $cluster_rrp_nodes = $::pacemaker::new::params::cluster_rrp_nodes,
$cluster_rrp_nodes = $::pacemaker::new::params::cluster_rrp_nodes, $cluster_name = $::pacemaker::new::params::cluster_name,
$cluster_name = $::pacemaker::new::params::cluster_name, $cluster_auth_key = $::pacemaker::new::params::cluster_auth_key,
$cluster_auth_key = $::pacemaker::new::params::cluster_auth_key, $cluster_auth_enabled = $::pacemaker::new::params::cluster_auth_enabled,
$cluster_setup = $::pacemaker::new::params::cluster_setup, $cluster_setup = $::pacemaker::new::params::cluster_setup,
$cluster_options = $::pacemaker::new::params::cluster_options, $cluster_options = $::pacemaker::new::params::cluster_options,
$cluster_user = $::pacemaker::new::params::cluster_user, $cluster_user = $::pacemaker::new::params::cluster_user,
$cluster_password = $::pacemaker::new::params::cluster_password, $cluster_group = $::pacemaker::new::params::cluster_group,
$pcs_bin_path = $::pacemaker::new::params::pcs_bin_path, $cluster_password = $::pacemaker::new::params::cluster_password,
$pcs_bin_path = $::pacemaker::new::params::pcs_bin_path,
$cluster_config_path = $::pacemaker::new::params::cluster_config_path, $cluster_config_path = $::pacemaker::new::params::cluster_config_path,
$cluster_interfaces = $::pacemaker::new::params::cluster_interfaces, $cluster_interfaces = $::pacemaker::new::params::cluster_interfaces,
$cluster_log_subsys = $::pacemaker::new::params::cluster_log_subsys, $cluster_log_subsys = $::pacemaker::new::params::cluster_log_subsys,
$plugin_version = $::pacemaker::new::params::plugin_version, $plugin_version = $::pacemaker::new::params::plugin_version,
$log_file_path = $::pacemaker::new::params::log_file_path, $log_file_path = $::pacemaker::new::params::log_file_path,
$pcsd_manage = $::pacemaker::new::params::pcsd_manage, $pcsd_manage = $::pacemaker::new::params::pcsd_manage,
$pcsd_enable = $::pacemaker::new::params::pcsd_enable, $pcsd_enable = $::pacemaker::new::params::pcsd_enable,

2
manifests/new/params.pp
View File

@ -24,7 +24,7 @@ class pacemaker::new::params {
$log_file_path = '/var/log/cluster/corosync.log' $log_file_path = '/var/log/cluster/corosync.log'
} elsif $::osfamily == 'Debian' { } elsif $::osfamily == 'Debian' {
$pcsd_mode = false $pcsd_mode = false
$package_list = ['pacemaker-mgmt', 'pacemaker', 'corosync', 'pacemaker-cli-utils', 'resource-agents'] $package_list = ['pacemaker-mgmt', 'pacemaker', 'corosync', 'pacemaker-cli-utils', 'resource-agents', 'crmsh']
$cluster_user = 'root' $cluster_user = 'root'
$cluster_group = 'root' $cluster_group = 'root'
$log_file_path = '/var/log/corosync/corosync.log' $log_file_path = '/var/log/corosync/corosync.log'

4
spec/functions/pacemaker_resource_parameters_spec.rb
View File

@ -15,7 +15,7 @@ describe 'pacemaker_resource_parameters' do
it { is_expected.to run.with_params('a', 'b').and_return({'a' => 'b'}) } it { is_expected.to run.with_params('a', 'b').and_return({'a' => 'b'}) }
it { is_expected.to run.with_params('a', 'b', 'c', nil, ['d', 1]).and_return({'a' => 'b', 'd' => 1}) } it { is_expected.to run.with_params('a', 'b', 'c', nil, ['d', 1], 'e', :undef).and_return({'a' => 'b', 'd' => 1}) }
it { is_expected.to run.with_params('a', 'b', 'c', 'd', {'e' => 'f', 'a' => '10'}).and_return({'a' => '10', 'c' => 'd', 'e' => 'f'}) } it { is_expected.to run.with_params('a', 'b', 'c', 'd', {'e' => 'f', 'a' => '10'}).and_return({'a' => '10', 'c' => 'd', 'e' => 'f'}) }
end end