summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--global/overlay/etc/puppet/cosmos-rules.yaml4
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp14
2 files changed, 18 insertions, 0 deletions
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 1a05060..4b93245 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -44,3 +44,7 @@ www2.eduid.se:
dockerhost:
'^web-.+\.sunet\.se$':
dockerhost:
+'^web-a[0-9]+\.sunet\.se$':
+ webappserver:
+'^web-f[0-9]+\.sunet\.se$':
+ webfrontend:
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 9c40748..4c4d5d0 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -790,3 +790,17 @@ class quantis {
apt::ppa {'ppa:ndn/quantispci': }
package {'quantispci-dkms': }
}
+
+class webcommon {
+ docker::image {'coreos/etcd': }
+}
+
+class webfrontend {
+ class { 'webcommon': }
+ docker::image {'docker.sunet.se/pound': }
+ docker::image {'docker.sunet.se/varnish': }
+}
+
+class webappserver {
+ class { 'webcommon': }
+}