From ff0818e426e3f77eebf34f66b3ea98a93d5efb32 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Sun, 22 Mar 2015 17:35:39 +0100 Subject: basic rules --- Makefile | 2 +- global/overlay/etc/puppet/cosmos-rules.yaml | 4 ++-- global/overlay/etc/puppet/manifests/cosmos-site.pp | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4c378d2..9b681b2 100644 --- a/Makefile +++ b/Makefile @@ -9,4 +9,4 @@ db: @git add global/overlay/etc/puppet/cosmos-db.yaml && git commit -m "update db" global/overlay/etc/puppet/cosmos-db.yaml tag: db - ./bump-tag + ./bump-tag 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} } -- cgit v1.1