projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
be423e9
)
retire glinka
author
Peter Palfrader
<peter@palfrader.org>
Sat, 11 Mar 2017 20:56:13 +0000
(21:56 +0100)
committer
Peter Palfrader
<peter@palfrader.org>
Sat, 11 Mar 2017 20:56:13 +0000
(21:56 +0100)
manifests/site.pp
patch
|
blob
|
history
modules/debian-org/misc/local.yaml
patch
|
blob
|
history
modules/multipath/templates/multipath-ubc-ganeti.conf.erb
patch
|
blob
|
history
modules/nfs-server/manifests/init.pp
patch
|
blob
|
history
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
098b96a
..
178fc2d
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-96,7
+96,7
@@
node default {
include named::geodns
}
include named::geodns
}
- if $::hostname in [buxtehude,
glinka,
milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
+ if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
include nfs-server
}
include nfs-server
}
diff --git
a/modules/debian-org/misc/local.yaml
b/modules/debian-org/misc/local.yaml
index
cb09c8b
..
8aec035
100644
(file)
--- a/
modules/debian-org/misc/local.yaml
+++ b/
modules/debian-org/misc/local.yaml
@@
-39,7
+39,6
@@
nameinfo:
fischer.debian.org: Johann Caspar Ferdinand Fischer (September 9th, 1656 - August 27th, 1746)
gideon.debian.org: Miriam Gideon (October 23rd, 1906 - June 18th, 1996)
gigault.debian.org: Nicolas Gigault (ca. 1627 - August 20th, 1707)
fischer.debian.org: Johann Caspar Ferdinand Fischer (September 9th, 1656 - August 27th, 1746)
gideon.debian.org: Miriam Gideon (October 23rd, 1906 - June 18th, 1996)
gigault.debian.org: Nicolas Gigault (ca. 1627 - August 20th, 1707)
- glinka.debian.org: Mikhail Ivanovich Glinka (1804 - 1857)
gombert.debian.org: Nicolas Gombert (c. 1495 - c. 1560)
gretchaninov: Alexander Tikhonovich Gretchaninov (October 25th, 1864 - January 3rd, 1956)
handel.debian.org: Georg Friedrich Händel (February 23rd, 1685 - April 14th, 1759)
gombert.debian.org: Nicolas Gombert (c. 1495 - c. 1560)
gretchaninov: Alexander Tikhonovich Gretchaninov (October 25th, 1864 - January 3rd, 1956)
handel.debian.org: Georg Friedrich Händel (February 23rd, 1685 - April 14th, 1759)
diff --git
a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
index
ae6d003
..
954d91f
100644
(file)
--- a/
modules/multipath/templates/multipath-ubc-ganeti.conf.erb
+++ b/
modules/multipath/templates/multipath-ubc-ganeti.conf.erb
@@
-21,17
+21,4
@@
blacklist {
}
}
multipaths {
}
}
multipaths {
- # glinka
- multipath {
- wwid 3600c0ff000d5f6bdf0eaa45101000000
- alias r10-glinka
- }
- multipath {
- wwid 3600c0ff000d5f6bdf1eaa45101000000
- alias r10-glinka-srv
- }
- multipath {
- wwid 3600c0ff000d5f6bd866d4c5101000000
- alias r6-glinka-mirrors
- }
}
}
diff --git
a/modules/nfs-server/manifests/init.pp
b/modules/nfs-server/manifests/init.pp
index
c44838d
..
7021ef3
100644
(file)
--- a/
modules/nfs-server/manifests/init.pp
+++ b/
modules/nfs-server/manifests/init.pp
@@
-26,9
+26,6
@@
class nfs-server {
buxtehude: {
$client_range = '(172.29.40.0/22 206.12.19.126/32)'
}
buxtehude: {
$client_range = '(172.29.40.0/22 206.12.19.126/32)'
}
- glinka: {
- $client_range = '(209.87.16.37/32 209.87.16.38/32)'
- }
gretchaninov: {
$client_range = '172.29.40.0/22'
}
gretchaninov: {
$client_range = '172.29.40.0/22'
}