summaryrefslogtreecommitdiff
path: root/global/overlay/etc/puppet
diff options
context:
space:
mode:
authorFredrik Thulin <fredrik@thulin.net>2014-02-25 09:33:32 +0100
committerFredrik Thulin <fredrik@thulin.net>2014-02-25 09:33:32 +0100
commita9a96696eee9cee87ef03ed7daf9df34bbc6c7b5 (patch)
treefc5b90a8201835da243454b1c6a088085dc66af0 /global/overlay/etc/puppet
parent297537d0a96b712fb997d14a2150911dd047c964 (diff)
parent8d2f9cc27ca9af1c16f7aa9597a93de00ed0ae2e (diff)
Merge branch 'master' of git.nordu.net:sunet-opssunet-ops-2014-02-25-v01
Diffstat (limited to 'global/overlay/etc/puppet')
-rw-r--r--global/overlay/etc/puppet/cosmos-rules.yaml2
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp6
-rw-r--r--global/overlay/etc/puppet/puppet.conf1
3 files changed, 8 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 1e4e857..8b161a2 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': }
+}
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