projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more rules for ganeti; try rsa keys
[mirror/dsa-puppet.git]
/
modules
/
ferm
/
templates
/
defs.conf.erb
diff --git
a/modules/ferm/templates/defs.conf.erb
b/modules/ferm/templates/defs.conf.erb
index
5e794e1
..
d5734df
100644
(file)
--- a/
modules/ferm/templates/defs.conf.erb
+++ b/
modules/ferm/templates/defs.conf.erb
@@
-21,9
+21,9
@@
@def $HOST_MAILRELAY_V4 = (<%=
mailrelay = []
@def $HOST_MAILRELAY_V4 = (<%=
mailrelay = []
-
localinfo
.keys.sort.each do |node|
- if
localinfo
[node]['mailrelay']
-
allnodeinfo
[node]['ipHostNumber'].each do |ip|
+
scope.lookupvar('site::localinfo')
.keys.sort.each do |node|
+ if
scope.lookupvar('site::localinfo')
[node]['mailrelay']
+
scope.lookupvar('site::allnodeinfo')
[node]['ipHostNumber'].each do |ip|
next if ip =~ /:/
mailrelay << ip
end
next if ip =~ /:/
mailrelay << ip
end
@@
-35,9
+35,9
@@
@def $HOST_MAILRELAY_V6 = (<%=
mailrelay = []
@def $HOST_MAILRELAY_V6 = (<%=
mailrelay = []
-
localinfo
.keys.sort.each do |node|
- if
localinfo
[node]['mailrelay']
-
allnodeinfo
[node]['ipHostNumber'].each do |ip|
+
scope.lookupvar('site::localinfo')
.keys.sort.each do |node|
+ if
scope.lookupvar('site::localinfo')
[node]['mailrelay']
+
scope.lookupvar('site::allnodeinfo')
[node]['ipHostNumber'].each do |ip|
next if ip =~ /\./
mailrelay << ip
end
next if ip =~ /\./
mailrelay << ip
end
@@
-51,9
+51,9
@@
@def $HOST_NAGIOS_V4 = (<%=
nagii = []
@def $HOST_NAGIOS_V4 = (<%=
nagii = []
-
localinfo
.keys.sort.each do |node|
- if
localinfo[node]['nagiosmaster'] or localinfo
[node]['extranrpeclient']
-
allnodeinfo
[node]['ipHostNumber'].each do |ip|
+
scope.lookupvar('site::localinfo')
.keys.sort.each do |node|
+ if
scope.lookupvar('site::localinfo')[node]['nagiosmaster'] or scope.lookupvar('site::localinfo')
[node]['extranrpeclient']
+
scope.lookupvar('site::allnodeinfo')
[node]['ipHostNumber'].each do |ip|
next if ip =~ /:/
nagii << ip
end
next if ip =~ /:/
nagii << ip
end
@@
-65,9
+65,9
@@
@def $HOST_NAGIOS_V6 = (<%=
nagii = []
@def $HOST_NAGIOS_V6 = (<%=
nagii = []
-
localinfo
.keys.sort.each do |node|
- if
localinfo[node]['nagiosmaster'] or localinfo
[node]['extranrpeclient']
-
allnodeinfo
[node]['ipHostNumber'].each do |ip|
+
scope.lookupvar('site::localinfo')
.keys.sort.each do |node|
+ if
scope.lookupvar('site::localinfo')[node]['nagiosmaster'] or scope.lookupvar('site::localinfo')
[node]['extranrpeclient']
+
scope.lookupvar('site::allnodeinfo')
[node]['ipHostNumber'].each do |ip|
next if ip =~ /\./
nagii << ip
end
next if ip =~ /\./
nagii << ip
end
@@
-81,9
+81,9
@@
@def $HOST_MUNIN_V4 = (<%=
munins = []
@def $HOST_MUNIN_V4 = (<%=
munins = []
-
localinfo
.keys.sort.each do |node|
- if
localinfo
[node]['muninmaster']
-
allnodeinfo
[node]['ipHostNumber'].each do |ip|
+
scope.lookupvar('site::localinfo')
.keys.sort.each do |node|
+ if
scope.lookupvar('site::localinfo')
[node]['muninmaster']
+
scope.lookupvar('site::allnodeinfo')
[node]['ipHostNumber'].each do |ip|
next if ip =~ /:/
munins << ip
end
next if ip =~ /:/
munins << ip
end
@@
-95,9
+95,9
@@
@def $HOST_MUNIN_V6 = (<%=
munins = []
@def $HOST_MUNIN_V6 = (<%=
munins = []
-
localinfo
.keys.sort.each do |node|
- if
localinfo
[node]['muninmaster']
-
allnodeinfo
[node]['ipHostNumber'].each do |ip|
+
scope.lookupvar('site::localinfo')
.keys.sort.each do |node|
+ if
scope.lookupvar('site::localinfo')
[node]['muninmaster']
+
scope.lookupvar('site::allnodeinfo')
[node]['ipHostNumber'].each do |ip|
next if ip =~ /\./
munins << ip
end
next if ip =~ /\./
munins << ip
end
@@
-111,9
+111,9
@@
@def $HOST_DB_V6 = (<%=
dbs = []
@def $HOST_DB_V6 = (<%=
dbs = []
-
localinfo
.keys.sort.each do |node|
- if
localinfo
[node]['dbmaster']
-
allnodeinfo
[node]['ipHostNumber'].each do |ip|
+
scope.lookupvar('site::localinfo')
.keys.sort.each do |node|
+ if
scope.lookupvar('site::localinfo')
[node]['dbmaster']
+
scope.lookupvar('site::allnodeinfo')
[node]['ipHostNumber'].each do |ip|
next if ip =~ /\./
dbs << ip
end
next if ip =~ /\./
dbs << ip
end
@@
-125,9
+125,9
@@
@def $HOST_DB_V4 = (<%=
dbs = []
@def $HOST_DB_V4 = (<%=
dbs = []
-
localinfo
.keys.sort.each do |node|
- if
localinfo
[node]['dbmaster']
-
allnodeinfo
[node]['ipHostNumber'].each do |ip|
+
scope.lookupvar('site::localinfo')
.keys.sort.each do |node|
+ if
scope.lookupvar('site::localinfo')
[node]['dbmaster']
+
scope.lookupvar('site::allnodeinfo')
[node]['ipHostNumber'].each do |ip|
next if ip =~ /:/
dbs << ip
end
next if ip =~ /:/
dbs << ip
end
@@
-141,9
+141,9
@@
@def $HOST_DEBIAN_V4 = (<%=
dbs = []
@def $HOST_DEBIAN_V4 = (<%=
dbs = []
-
allnodeinfo
.keys.sort.each do |node|
- next unless
allnodeinfo
[node].has_key?('ipHostNumber')
-
allnodeinfo
[node]['ipHostNumber'].each do |ip|
+
scope.lookupvar('site::allnodeinfo')
.keys.sort.each do |node|
+ next unless
scope.lookupvar('site::allnodeinfo')
[node].has_key?('ipHostNumber')
+
scope.lookupvar('site::allnodeinfo')
[node]['ipHostNumber'].each do |ip|
next if ip =~ /:/
dbs << ip
end
next if ip =~ /:/
dbs << ip
end
@@
-154,9
+154,9
@@
@def $HOST_DEBIAN_V6 = (<%=
dbs = []
@def $HOST_DEBIAN_V6 = (<%=
dbs = []
-
allnodeinfo
.keys.sort.each do |node|
- next unless
allnodeinfo
[node].has_key?('ipHostNumber')
-
allnodeinfo
[node]['ipHostNumber'].each do |ip|
+
scope.lookupvar('site::allnodeinfo')
.keys.sort.each do |node|
+ next unless
scope.lookupvar('site::allnodeinfo')
[node].has_key?('ipHostNumber')
+
scope.lookupvar('site::allnodeinfo')
[node]['ipHostNumber'].each do |ip|
next if ip =~ /\./
dbs << ip
end
next if ip =~ /\./
dbs << ip
end
@@
-165,6
+165,9
@@
dbs.join(' ')
%>);
dbs.join(' ')
%>);
+@def $HOST_GANETI_V4 = (206.12.19.213/32 206.12.19.217/32);
+@def $HOST_DRBD_V4 = (192.168.2.213/32 192.168.2.217/32);
+
@def $HOST_DEBIAN = ($HOST_DEBIAN_V4 $HOST_DEBIAN_V6);
@def $sgran = (91.103.132.24/29 85.158.45.51/32);
@def $HOST_DEBIAN = ($HOST_DEBIAN_V4 $HOST_DEBIAN_V6);
@def $sgran = (91.103.132.24/29 85.158.45.51/32);
@@
-179,6
+182,10
@@
@def $zobel = ($zobel 87.139.82.80/32); # exit.credativ.com
@def $zobel = ($zobel 87.193.134.192/27); # credativ qsc
@def $zobel = ($zobel 78.47.2.104/29); # baldur, bragi, saga
@def $zobel = ($zobel 87.139.82.80/32); # exit.credativ.com
@def $zobel = ($zobel 87.193.134.192/27); # credativ qsc
@def $zobel = ($zobel 78.47.2.104/29); # baldur, bragi, saga
+@def $zobel = ($zobel 92.198.42.24/29); # DG-i Office
+@def $zobel = ($zobel 93.94.128.0/21); # DG-i AS
+@def $zobel = ($zobel 195.49.152.0/22); # DG-i AS
+@def $zobel = ($zobel 194.187.64.0/22); # DG-i AS
@def $luca = (64.71.152.109);
@def $paravoid = (83.212.9.72); # faidon.noc.grnet.gr
@def $tfheen = ();
@def $luca = (64.71.152.109);
@def $paravoid = (83.212.9.72); # faidon.noc.grnet.gr
@def $tfheen = ();
@@
-197,6
+204,7
@@
@def $zobel6 = ($zobel6 2001:6f8:928::/48); # WS2
@def $zobel6 = ($zobel6 2a01:198:549::/48); # WGS20
@def $zobel6 = ($zobel6 2a01:198:6b2::/48); # AdS20
@def $zobel6 = ($zobel6 2001:6f8:928::/48); # WS2
@def $zobel6 = ($zobel6 2a01:198:549::/48); # WGS20
@def $zobel6 = ($zobel6 2a01:198:6b2::/48); # AdS20
+@def $zobel6 = ($zobel6 2a02:158::/32); # DG-i AS
@def $luca6 = ();
@def $paravoid6 = (2001:648:2340:1:225:64ff:fea4:8590); # faidon.noc.grnet.gr
@def $tfheen6 = ();
@def $luca6 = ();
@def $paravoid6 = (2001:648:2340:1:225:64ff:fea4:8590); # faidon.noc.grnet.gr
@def $tfheen6 = ();