From 631a1380aac17d816e1e24401d75d883e7ebf897 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 18 Nov 2018 10:50:11 +0100 Subject: [PATCH] Use ldap's purpose field (ganeti/kvm host) to decide which hosts get the puppet ganeti module --- manifests/site.pp | 2 +- modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/site.pp b/manifests/site.pp index f4494e6b0..9bf2eb834 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -55,7 +55,7 @@ node default { } } - if $::hostname in [byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14,csail-node01,csail-node02,grnet-node01,grnet-node02,ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10,conova-node01,conova-node02] { + if getfromhash($site::nodeinfo, 'ganeti') { include ganeti2 } diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb index 3bfaa5c27..b0a91f157 100644 --- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb +++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb @@ -14,6 +14,7 @@ module Puppet::Parser::Functions nodeinfo['buildd'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('buildd')) nodeinfo['timeserver'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('timeserver')) nodeinfo['porterbox'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('porterbox')) + nodeinfo['ganeti'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('ganeti/kvm host')) if lookupvar('::mta') == 'exim4' unless nodeinfo['heavy_exim'] -- 2.20.1