diff options
| -rw-r--r-- | global/overlay/etc/puppet/cosmos-db.yaml | 10 | ||||
| -rw-r--r-- | global/overlay/etc/puppet/cosmos-modules.conf | 1 | ||||
| -rw-r--r-- | global/overlay/etc/puppet/cosmos-rules.yaml | 3 | ||||
| -rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 34 | ||||
| l--------- | md-master.reep.refeds.org/README | 1 | ||||
| -rw-r--r-- | sto-tug-kvm1.swamid.se/overlay/etc/network/interfaces | 27 |
6 files changed, 58 insertions, 18 deletions
diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index 08055f5..f522aa4 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -2,6 +2,7 @@ classes: cdr1.sunet.se: {sunet: null, sunet-cdr: null} cdr2.sunet.se: {sunet: null, sunet-cdr: null} dane.lab.sunet.se: {} + md-master.reep.refeds.org: {sunet: null, swamidops: null} meta.swamid.se: {sunet: null, swamidops: null} random1.nordu.net: {entropyserver: null, quantis: null, sunet: null} random2.nordu.net: {entropyserver: null, quantis: null, sunet: null} @@ -14,13 +15,14 @@ classes: members: all: [meta.swamid.se, sto-tug-kvm1.swamid.se, samltest.swamid.se, cdr1.sunet.se, dane.lab.sunet.se, sto-tug-kvm-lab1.swamid.se, random1.nordu.net, wp.sunet.se, - registry.swamid.se, cdr2.sunet.se, sto-tug-kvm-lab2.swamid.se, random2.nordu.net] + registry.swamid.se, md-master.reep.refeds.org, cdr2.sunet.se, sto-tug-kvm-lab2.swamid.se, + random2.nordu.net] entropyserver: [random1.nordu.net, random2.nordu.net] quantis: [random1.nordu.net, random2.nordu.net] sunet: [meta.swamid.se, sto-tug-kvm1.swamid.se, samltest.swamid.se, cdr1.sunet.se, - sto-tug-kvm-lab1.swamid.se, random1.nordu.net, registry.swamid.se, cdr2.sunet.se, - sto-tug-kvm-lab2.swamid.se, random2.nordu.net] + sto-tug-kvm-lab1.swamid.se, random1.nordu.net, registry.swamid.se, md-master.reep.refeds.org, + cdr2.sunet.se, sto-tug-kvm-lab2.swamid.se, random2.nordu.net] sunet-cdr: [cdr1.sunet.se, cdr2.sunet.se] swamidops: [meta.swamid.se, sto-tug-kvm1.swamid.se, samltest.swamid.se, sto-tug-kvm-lab1.swamid.se, - registry.swamid.se, sto-tug-kvm-lab2.swamid.se] + registry.swamid.se, md-master.reep.refeds.org, sto-tug-kvm-lab2.swamid.se] diff --git a/global/overlay/etc/puppet/cosmos-modules.conf b/global/overlay/etc/puppet/cosmos-modules.conf index f378327..7a95b31 100644 --- a/global/overlay/etc/puppet/cosmos-modules.conf +++ b/global/overlay/etc/puppet/cosmos-modules.conf @@ -21,3 +21,4 @@ wordpress hunner/wordpress no mysql puppetlabs/mysql no apache puppetlabs/apache no pyff git://github.com/samlbits/puppet-pyff.git yes sunet-* +postgresql git://github.com/SUNET/puppetlabs-postgresql.git yes sunet-* diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 0346b4d..36476b1 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -7,6 +7,9 @@ '\.swamid\.se$': sunet: swamidops: +md-master.reep.refeds.org: + sunet: + swamidops: '^random\d+\.nordu\.net$': entropyserver: quantis: diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index f17a254..63462a7 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -56,10 +56,27 @@ node 'sto-tug-kvm1.swamid.se' { cpus => '1', memory => '2048', } + + cosmos::dhcp_kvm { 'md-master.reep.refeds.org': + mac => '52:54:00:39:8d:ac', + repo => 'git://git.nordu.net/sunet-ops.git', + tagpattern => 'sunet-ops', + cpus => '1', + memory => '2048', + } +} + +node 'md-master.reep.refeds.org' { + #include cosmos::httpsproxy + class {'pyff': + load => ['/opt/peer/vf_repo'], + validUntil => 'P10D', + cacheDuration => 'PT5H' + } } node 'registry.swamid.se' { - include cosmos::httpsproxy + #include cosmos::httpsproxy class {'pyff': load => ['/opt/peer/vf_repo'], validUntil => 'P10D', @@ -73,6 +90,14 @@ node 'registry.swamid.se' { python::pip { 'peer==0.13.0': virtualenv => '/opt/peer' } + + #class { 'postgresql::server': } + + #postgresql::server::db { 'peer': + # encoding => 'utf-8', + # user => 'peer', + # password => postgresql_password('peer', hiera('peer_db_password')), + #} } node 'sto-tug-kvm-lab1.swamid.se' { @@ -286,9 +311,10 @@ class sunet-dhcp-hosts { # SUNET TUG hosts - dhcp::host { 'samltest': mac => "52:54:00:3a:0a:e4", ip => "130.242.125.80" } - dhcp::host { 'dane.lab': mac => "52:54:00:8d:88:5f", ip => "130.242.125.81" } - dhcp::host { 'meta.swamid': mac => "52:54:00:1c:72:1a", ip => "130.242.125.82" } + dhcp::host { 'samltest': mac => "52:54:00:3a:0a:e4", ip => "130.242.125.80" } + dhcp::host { 'dane.lab': mac => "52:54:00:8d:88:5f", ip => "130.242.125.81" } + dhcp::host { 'meta.swamid': mac => "52:54:00:1c:72:1a", ip => "130.242.125.82" } + dhcp::host { 'md-master.reep': mac => "52:54:00:39:8d:ac", ip => "130.242.125.83" } # SWAMID production dhcp::host { 'registry.swamid': mac => "52:54:00:52:53:0b", ip => "130.242.125.90" } diff --git a/md-master.reep.refeds.org/README b/md-master.reep.refeds.org/README new file mode 120000 index 0000000..59a23c4 --- /dev/null +++ b/md-master.reep.refeds.org/README @@ -0,0 +1 @@ +../README
\ No newline at end of file diff --git a/sto-tug-kvm1.swamid.se/overlay/etc/network/interfaces b/sto-tug-kvm1.swamid.se/overlay/etc/network/interfaces index 5eca717..4490f48 100644 --- a/sto-tug-kvm1.swamid.se/overlay/etc/network/interfaces +++ b/sto-tug-kvm1.swamid.se/overlay/etc/network/interfaces @@ -5,20 +5,27 @@ auto lo iface lo inet loopback -# The primary network interface auto eth0 -iface eth0 inet static - address 130.242.125.5 +iface eth0 inet manual + +# The primary network interface +auto br0 +iface br0 inet static + address 130.242.125.71 netmask 255.255.255.192 - network 130.242.125.0 - broadcast 130.242.125.63 - gateway 130.242.125.1 + network 130.242.125.64 + broadcast 130.242.125.127 + gateway 130.242.125.65 # dns-* options are implemented by the resolvconf package, if installed dns-nameservers 130.242.80.14 130.242.80.99 dns-search swamid.se + bridge_ports eth0 + bridge_fd 9 + bridge_hello 2 + bridge_maxage 12 -iface eth0 inet6 static - address 2001:6b0:8:3::5 - netmask 64 - gateway 2001:6b0:8:3::1 +#iface eth0 inet6 static +# address 2001:6b0:8:3::5 +# netmask 64 +# gateway 2001:6b0:8:3::1 |