summaryrefslogtreecommitdiff
path: root/global
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-03-22 17:35:39 +0100
committerLeif Johansson <leifj@sunet.se>2015-03-22 17:35:39 +0100
commitff0818e426e3f77eebf34f66b3ea98a93d5efb32 (patch)
tree49d6e5ee1cb0bbed9943d4104cd5e0f3ac4d96e4 /global
parent41641996e17d04cdaf45dc0fe34ef29fb9567343 (diff)
Diffstat (limited to 'global')
-rw-r--r--global/overlay/etc/puppet/cosmos-rules.yaml4
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp4
2 files changed, 6 insertions, 2 deletions
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index d9dc495..ceabceb 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -1,2 +1,2 @@
-'ns[0-9]?.mnt.se$':
- nameserver:
+'^[f,m][0-9]?.ct.nordu.net$':
+ dockerhost:
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 70fcc59..940d4c6 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -27,6 +27,10 @@ node default {
}
+class dockerhost {
+ class { 'sunet::dockerhost': }
+}
+
class mailclient ($domain) {
cosmos::preseed::preseed_package {"postfix": ensure => present, domain => $domain}
}