cosmos puppet portsunet-ops-2015-09-07-v02

1 files changed, 15 insertions, 15 deletions

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 60e5ad1..3b870de 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -4,11 +4,11 @@ Exec {
   path => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
 }
 
-include cosmos::tools
-include cosmos::motd
-include cosmos::ntp
+include sunet::tools
+include sunet::motd
+include sunet::ntp
 include cosmos::rngtools
-include cosmos::preseed
+include sunet::preseed
 include ufw
 include apt
 include cosmos
@@ -70,7 +70,7 @@ node 'sto-tug-kvm1.swamid.se' {
      ensure    => 'installed',
    } ->
 
-   cosmos::dhcp_kvm { 'registry.swamid.se':
+   sunet::dhcp_kvm { 'registry.swamid.se':
      mac        => '52:54:00:52:53:0b',
      repo       => 'git://git.nordu.net/sunet-ops.git',
      tagpattern => 'sunet-ops',
@@ -78,7 +78,7 @@ node 'sto-tug-kvm1.swamid.se' {
      memory     => '2048',
    }
 
-   cosmos::dhcp_kvm { 'mdx1.swamid.se':
+   sunet::dhcp_kvm { 'mdx1.swamid.se':
      mac        => '52:54:00:fe:bc:09',
      repo       => 'git://git.nordu.net/sunet-ops.git',
      tagpattern => 'sunet-ops',
@@ -86,7 +86,7 @@ node 'sto-tug-kvm1.swamid.se' {
      memory     => '2048',
    }
  
-   cosmos::dhcp_kvm { 'md-master.reep.refeds.org':
+   sunet::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',
@@ -100,7 +100,7 @@ node 'sto-fre-kvm1.swamid.se' {
      ensure    => 'installed',
    } ->
 
-   cosmos::dhcp_kvm { 'mdx2.swamid.se':
+   sunet::dhcp_kvm { 'mdx2.swamid.se':
      mac        => '52:54:00:30:be:dd',
      repo       => 'git://git.nordu.net/sunet-ops.git',
      tagpattern => 'sunet-ops',
@@ -252,7 +252,7 @@ node 'sto-tug-kvm-lab1.swamid.se' {
      ensure    => 'installed',
    } ->
 
-   cosmos::dhcp_kvm { 'samltest.swamid.se':
+   sunet::dhcp_kvm { 'samltest.swamid.se':
      mac        => '52:54:00:3a:0a:e4',
      repo       => 'git://git.nordu.net/sunet-ops.git',
      tagpattern => 'sunet-ops',
@@ -260,7 +260,7 @@ node 'sto-tug-kvm-lab1.swamid.se' {
      memory     => '1024',
    }
 
-   cosmos::dhcp_kvm { 'dane.lab.sunet.se':
+   sunet::dhcp_kvm { 'dane.lab.sunet.se':
      mac        => '52:54:00:8d:88:5f',
      repo       => 'git://git.nordu.net/sunet-ops.git',
      tagpattern => 'sunet-ops',
@@ -268,7 +268,7 @@ node 'sto-tug-kvm-lab1.swamid.se' {
      memory     => '1024',
    }
 
-   cosmos::dhcp_kvm { 'lobo2.lab.sunet.se':
+   sunet::dhcp_kvm { 'lobo2.lab.sunet.se':
      mac        => '52:54:00:5e:72:91',
      repo       => 'git://git.nordu.net/sunet-ops.git',
      tagpattern => 'sunet-ops',
@@ -276,7 +276,7 @@ node 'sto-tug-kvm-lab1.swamid.se' {
      memory     => '1024',
    }
 
-   cosmos::dhcp_kvm { 'ca.sunet.se':
+   sunet::dhcp_kvm { 'ca.sunet.se':
      mac        => '52:54:00:4a:45:01',
      repo       => 'git://git.nordu.net/sunet-ops.git',
      tagpattern => 'sunet-ops',
@@ -284,7 +284,7 @@ node 'sto-tug-kvm-lab1.swamid.se' {
      memory     => '1024',
    }
 
-   cosmos::dhcp_kvm { 'meta.swamid.se':
+   sunet::dhcp_kvm { 'meta.swamid.se':
      mac        => '52:54:00:1c:72:1a',
      repo       => 'git://git.nordu.net/sunet-ops.git',
      tagpattern => 'sunet-ops',
@@ -735,7 +735,7 @@ node 'cdr1.sunet.se' {
      ensure    => 'installed',
    } ->
 
-   cosmos::dhcp_kvm { 'backup-tug-3.eduid.se':
+   sunet::dhcp_kvm { 'backup-tug-3.eduid.se':
      mac        => '52:54:00:f2:7d:54',
      repo       => 'git://git.nordu.net/eduid-ops.git',
      tagpattern => 'eduid-v3',
@@ -745,7 +745,7 @@ node 'cdr1.sunet.se' {
      extras     => '--addpkg linux-image-generic --tmpfs -',
    }
 
-   cosmos::dhcp_kvm { 'proxy-tug-3.eduid.se':
+   sunet::dhcp_kvm { 'proxy-tug-3.eduid.se':
      mac        => '52:54:00:f2:7d:55',
      repo       => 'git://git.nordu.net/eduid-ops.git',
      tagpattern => 'eduid-v3',