openstack/fuel-library
Code Issues Proposed changes

Merge "Added ability to specify role for corosync nodes."

Browse Source
This commit is contained in:
Jenkins 2015-06-24 12:35:24 +00:00 committed by Gerrit Code Review
commit 30cac2d68e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment/puppet/osnailyfacter/lib/puppet/parser/functions/corosync_nodes.rb
View File

@ -5,6 +5,7 @@ to be used in pcmk_nodes resource.
EOS
) do |args|
nodes = args[0]
roles = args[1] || %w(primary-controller controller)
fail "You should provided 'nodes' structure!" unless nodes.is_a? Array and nodes.any?
corosync_nodes = {}
nodes.each do |node|
@ -12,7 +13,7 @@ to be used in pcmk_nodes resource.
ip = node['internal_address']
uid = node['uid']
role = node['role']
next unless %w(primary-controller controller).include? role
next unless roles.include? role
next unless ip and fqdn
corosync_nodes[fqdn] = {
'id' => uid,

3
deployment/puppet/osnailyfacter/modular/cluster/cluster.pp
View File

@ -1,7 +1,8 @@
notice('MODULAR: cluster.pp')
$nodes = hiera('nodes')
$corosync_nodes = corosync_nodes($nodes)
$corosync_roles = hiera('corosync_roles',['primary-controller', 'controller'])
$corosync_nodes = corosync_nodes($nodes,$corosync_roles)
$internal_address = hiera('internal_address')
class { 'cluster':