From aaac847d84bd4660ae4011a866cd5c8bef791a2c Mon Sep 17 00:00:00 2001 From: Stefan Wold Date: Fri, 20 Dec 2013 13:10:27 +0100 Subject: Include the new cosmos-modules dir in module path --- global/overlay/etc/puppet/puppet.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'global/overlay/etc/puppet') diff --git a/global/overlay/etc/puppet/puppet.conf b/global/overlay/etc/puppet/puppet.conf index 0ba85f4..a269892 100644 --- a/global/overlay/etc/puppet/puppet.conf +++ b/global/overlay/etc/puppet/puppet.conf @@ -7,6 +7,7 @@ factpath=$vardir/lib/facter templatedir=$confdir/templates node_terminus = exec external_nodes = /etc/puppet/cosmos_enc.py +modulepath = /etc/puppet/modules:/etc/puppet/cosmos-modules:/usr/share/puppet/modules [master] # These are needed when the puppetmaster is run by passenger -- cgit v1.1 From 8d2f9cc27ca9af1c16f7aa9597a93de00ed0ae2e Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Fri, 21 Feb 2014 23:11:52 +0100 Subject: swamid rules --- global/overlay/etc/puppet/cosmos-rules.yaml | 2 ++ global/overlay/etc/puppet/manifests/cosmos-site.pp | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'global/overlay/etc/puppet') 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': } +} -- cgit v1.1