diff options
| author | Leif Johansson <leifj@sunet.se> | 2014-11-05 23:08:40 +0100 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2014-11-05 23:08:40 +0100 |
| commit | 705587f89c98f08701c3b5b5c1f205fe5a0eb957 (patch) | |
| tree | b15e2da69021d57bb5a6201536199ff4c94c6c7d | |
| parent | a9df4bba6c9f85c789375297388e459b8d982e04 (diff) | |
| parent | 098ee627431c59d30d29e234dd64e5e4cfdad821 (diff) | |
Merge branch 'master' of git.nordu.net:sunet-opssunet-ops-2014-11-05-v02
| -rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 9 | ||||
| -rw-r--r-- | sto-tug-kvm2.swamid.se/overlay/etc/network/interfaces | 41 |
2 files changed, 50 insertions, 0 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index ee9afb2..0a65f8d 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -462,6 +462,7 @@ class sunet-dhcp-hosts { dhcp::host { 'worker-fre-1': mac => "52:54:00:a0:01:c4", ip => "130.242.130.196" } dhcp::host { 'actions-tug-1': mac => "52:54:00:a0:01:c5", ip => "130.242.130.197" } dhcp::host { 'mq-tug-1': mac => "52:54:00:a0:01:c6", ip => "130.242.130.198" } + dhcp::host { 'proxy-tug-1': mac => "52:54:00:a0:01:c7", ip => "130.242.130.199" } dhcp::host { 'auth-fre-1_eth0': mac => "78:45:c4:f7:91:67", ip => "130.242.130.204", hostname => 'auth-fre-1'; } dhcp::host { 'auth-fre-1_eth1': mac => "78:45:c4:f7:91:68", ip => "130.242.130.204", hostname => 'auth-fre-1'; } @@ -577,6 +578,14 @@ class sunetops { user => 'root' } + ssh_authorized_key {'lundberg+9303C5DB': + type => 'ssh-rsa', + key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDAHMfn9PSWjGGAkMY6rh1yffdYgnlhoIC5E5NWdc5XUlY9oNYW2zhMpyhepfoh1YYv5V1QNTuO3f0zhD+ZeqPvnnA74fBM4yvWU4Qttwv2drsFOsU7nRbGSwQdww9IDidtxRuAjW5HJ9mTOJuYrIFAEHgg1Pv8sZKzHNWuZiz4I34CN2NbaZOu4eYG6pdzvB6kfYl5iL/esfhBZfegA+7x4qXvMLHEKb7wCRBABCfWu6Yy1E0jUdRWBFdqp5zsjuQlk8minh892m2C1tFcyub5dCWgLYtiQRpIjz16lMk1cM+fgS9YM7Ev62bBpRynU2wCfg1QpYMpxIq54q/XLlYv', + ensure => present, + user => 'root', + name => 'lundberg+9303C5DB' + } + # OS hardening if $::hostname =~ /kvm/ { class {'bastion': diff --git a/sto-tug-kvm2.swamid.se/overlay/etc/network/interfaces b/sto-tug-kvm2.swamid.se/overlay/etc/network/interfaces new file mode 100644 index 0000000..10cdcf5 --- /dev/null +++ b/sto-tug-kvm2.swamid.se/overlay/etc/network/interfaces @@ -0,0 +1,41 @@ +# This file describes the network interfaces available on your system +# and how to activate them. For more information, see interfaces(5). + +# The loopback network interface +auto lo +iface lo inet loopback + +# The primary network interface +auto em1 +iface em1 inet static + address 192.36.125.9 + netmask 255.255.255.0 + network 192.36.125.0 + broadcast 192.36.125.255 + gateway 192.36.125.1 + # dns-* options are implemented by the resolvconf package, if installed + dns-nameservers 130.242.80.14 130.242.80.99 + dns-search swamid.se + +iface em1 inet6 static + address 2001:6b0:7::9 + netmask 64 + gateway 2001:6b0:7::1 + dns-nameservers 2001:6b0:1e:14 2001:6b0:1e:99 + +auto em1:0 +iface em1:0 inet static + address 192.36.125.10 + netmask 255.255.255.0 + network 192.36.125.0 + broadcast 192.36.125.255 + gateway 192.36.125.1 + # dns-* options are implemented by the resolvconf package, if installed + dns-nameservers 130.242.80.14 130.242.80.99 + dns-search sunet.se + +iface em1:0 inet6 static + address 2001:6b0:7::10 + netmask 64 + gateway 2001:6b0:7::1 + dns-nameservers 2001:6b0:1e:14 2001:6b0:1e:99 |