diff options
| author | Leif Johansson <leifj@sunet.se> | 2014-11-17 13:58:42 +0100 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2014-11-17 13:58:42 +0100 |
| commit | 4c6152385f101ed6d8a1a788a70916aa31c8b977 (patch) | |
| tree | 3c660c7885e6de18ab0ce7b34771293fd319fc3c /global/overlay/etc/puppet | |
| parent | 7beeee9733b142bf29a5720a68ba1fc975173ffe (diff) | |
| parent | 8e42fbe21eccd47022ae8b9b7ef2220f028f06ab (diff) | |
Merge branch 'master' of git.nordu.net:sunet-opssunet-ops-2014-11-17-v01
Diffstat (limited to 'global/overlay/etc/puppet')
| -rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 1d08752..8813e1b 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -482,7 +482,7 @@ class sunet-dhcp-hosts { dhcp::host { 'auth-tug-1_eth0': mac => "78:45:c4:f8:43:c5", ip => "130.242.130.205", hostname => 'auth-tug-1'; } dhcp::host { 'auth-tug-1_eth1': mac => "78:45:c4:f8:43:c6", ip => "130.242.130.205", hostname => 'auth-tug-1'; } - dhcp::host { 'admin-tug-1': mac => "52:54:00:a0:01:d4", ip => "130.242.130.212" } + dhcp::host { 'signup-tug-1': mac => "52:54:00:a0:01:d4", ip => "130.242.130.212" } dhcp::host { 'dash-fre-1': mac => "52:54:00:a0:01:d5", ip => "130.242.130.213" } @@ -598,6 +598,14 @@ class sunetops { name => 'lundberg+9303C5DB' } + ssh_authorized_key {'salu+82A313B2': + ensure => present, + name => 'salu+82A313B2@nordu.net', + key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDeqxYSykQRs9Wbh+uRCYqRUjsFfdlc4//bs3dbedE/8kZWvvSmBlcqizXKVSlABrwyqGDpxW9bD+lRC53zArDMaqYUQbkzYs0NYYeE1bA4HUI/f4SgDn7PKicJLcbIOFTEjdOAqoi+KXji6Y5kxmcNYcU/XbyUln7FCItIFTXLF6VJBR1edokXAtsQBeD+H+xJA34Ha4TkBPKSeYjt+OoCZSjW0cz9g/+T59WsLZ/uJPZNqTgP5QOnBBmqURXDosXhjfPRrUQAyySM9D0riqMY4gtUgVvvnSXZqgquk0/79JjR10QAFmauxRdYmTBG7NU8EM7bXqUeuEFQIl9aiIe3', + type => 'ssh-rsa', + user => 'root' + } + # OS hardening if $::hostname =~ /kvm/ { class {'bastion': |