diff options
| author | Fredrik Thulin <fredrik@thulin.net> | 2014-05-26 11:47:59 +0200 |
|---|---|---|
| committer | Fredrik Thulin <fredrik@thulin.net> | 2014-05-26 11:47:59 +0200 |
| commit | 9b27b9f2542d8e065e194736d008aa2cdb1c4cfc (patch) | |
| tree | ee39ef5a52b0e6b24cc5bf4de82df06d0ab38231 /global/overlay/etc/puppet/manifests | |
| parent | 15476295654c13802503ba10110663580a80de76 (diff) | |
| parent | 266039ca73ee423630610ccbd16046bd52545379 (diff) | |
Merge remote-tracking branch 'remotes/origin/master'sunet-ops-2014-05-26-v01
Diffstat (limited to 'global/overlay/etc/puppet/manifests')
| -rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 34 |
1 files changed, 30 insertions, 4 deletions
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" } |