summaryrefslogtreecommitdiff
path: root/global
diff options
context:
space:
mode:
Diffstat (limited to 'global')
-rw-r--r--global/overlay/etc/puppet/cosmos-rules.yaml2
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp27
2 files changed, 28 insertions, 1 deletions
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 0271f1f..6779ab0 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -6,3 +6,5 @@
sunet:
'\.swamid\.se$':
sunet:
+meta.swamid.se:
+ swamidops:
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index d6a5e59..b7d11e8 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -79,6 +79,14 @@ node 'sto-tug-kvm-lab1.swamid.se' {
cpus => '1',
memory => '1024',
}
+
+ cosmos::dhcp_kvm { 'meta.swamid.se':
+ mac => '52:54:00:1c:72:1a',
+ repo => 'git://git.nordu.net/sunet-ops.git',
+ tagpattern => 'sunet-ops',
+ cpus => '1',
+ memory => '1024',
+ }
}
class sunet-dhcp-hosts {
@@ -256,7 +264,7 @@ class sunet-dhcp-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" }
}
class sunet {
@@ -342,6 +350,23 @@ node 'samltest.swamid.se' {
}
+class swamidops {
+ ssh_authorized_key {'roland-umu':
+ type => 'ssh-rsa',
+ key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQC+tLFDNA7UXr3ZXgp6qQq7pKsTStHb+8UIEO3Act7Va3c/dz9P8Bi4+y8h33t2SACsQHXXUXAgSfmgPi+tijZ/rJrKGZJkA5LPbntca40ePU/zNWKVKGylbdnv9vz2urrr3xOmcV7yD/91k+JLwzTWiNWF6IXQC0p43EvE6BdZnLGdGAU9DPj/5rtyxWlX9Lul516dmVD2+nI8UR5bnDNl83a3lLkQyEDZMIC8QujNV8fR3pgYeRKdC7WtPcaPGv5NaF9UweBDK+7QwHTJAuIZw6S7ArA7KgOF64evOuVL0tTEyuwMHGrlE+ylxN+zOAfDvEMrxnTATR6RMcvLmTJB',
+ ensure => present,
+ user => 'root',
+ name => 'roland.hedberg@adm.umu.se'
+ }
+ ssh_authorized_key {'lordahl-hig':
+ type => 'ssh-rsa',
+ key => 'AAAAB3NzaC1yc2EAAAABIwAAAQEAoghSjIy5fx9SY6bCq39yY3+SVdPbeq+giJzkJgQNpRj7kv60gPimRZc793j/tBByb739b6WhK+Bx7VibJwop2Tuq22/gIAdY7shXeaGCDCfNkDwjAqEoct+DpoRHEojGghMooVj7gCgaEUJmArEjPMHqkQ3AGZISN6vvxcn7CPhcYtOlrUL/EWkPyrks5MHcmwDZpPCoY37XgJVp3H0GbidBLY869X926AH9DrORjQBgNVy2HnrxDDtKzX/o6UB6LTj2oUjmuMaEDXFdMgWBq7UHgguut8gp14o6k4aaWvjklcjckuW5BC7sdD46qkxzXPLhae2neRj2bziiyKnyYQ==',
+ ensure => present,
+ user => 'root',
+ name => 'anders@merlin'
+ }
+}
+
node 'dane.lab.sunet.se' {
class {'sunet': }
}