diff options
| author | Leif Johansson <leifj@sunet.se> | 2014-10-24 19:02:15 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2014-10-24 19:02:15 +0200 |
| commit | 908ada6e6521b62c5452e6fb84a2edb1b31fda09 (patch) | |
| tree | aed027ca97ba5cfc032fbe51987f580cbeb56180 | |
| parent | 8bdf4711fc7d8c3a179d9ba2593f3d0b1277eb74 (diff) | |
cleanup class structuresunet-ops-2014-10-24-v12
| -rw-r--r-- | global/overlay/etc/puppet/cosmos-rules.yaml | 8 | ||||
| -rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 2851fb1..4fe0137 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -1,13 +1,13 @@ '^cdr\d+\.sunet\.se$': sunet-cdr: - sunet: + sunetops: '\.swamid\.se$': - sunet: + sunetops: swamidops: mailclient: domain: sunet.se '\.sunet\.se$': - sunet: + sunetops: mailclient: domain: sunet.se registry.swamid.se: @@ -28,7 +28,7 @@ mdx2.swamid.se: sto-tug-kvm2.swamid.se: dockerhost: md-master.reep.refeds.org: - sunet: + sunetops: swamidops: '^random\d+\.nordu\.net$': entropyserver: diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index b634e8c..d91a0c1 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -480,7 +480,7 @@ class sunet-dhcp-hosts { dhcp::host { 'mdx2.swamid': mac => "52:54:00:30:be:dd", ip => "130.242.125.92" } } -class sunet { +class sunetops { package { ['openssh-server', 'emacs23-nox']: ensure => 'installed' |