summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2014-02-21 23:11:52 +0100
committerLeif Johansson <leifj@sunet.se>2014-02-21 23:11:52 +0100
commit8d2f9cc27ca9af1c16f7aa9597a93de00ed0ae2e (patch)
tree045298d9bf62de7049fc1b3d7fc4d13d6df0f4de
parent15addc653b2b0a3acbba8047541aa5467e602e6c (diff)
-rw-r--r--global/overlay/etc/puppet/cosmos-rules.yaml2
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp6
2 files changed, 7 insertions, 1 deletions
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 2244c7a..137bd28 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -4,3 +4,5 @@
'^cdr\d+\.sunet\.se$':
sunet-cdr:
sunet:
+'\.swamid\.se$':
+ swamid:
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 737045a..d916f97 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -13,7 +13,7 @@ Exec {
#include cosmos::preseed
include ufw
include apt
-include cosmos
+#include cosmos
# you need a default node
@@ -275,3 +275,7 @@ class sunet-cdr {
class { 'sunet-dhcp-hosts': }
}
+
+class swamid {
+ sunet::server { 'sunet_server': }
+}