From 0da963d37ba7980d972ebedc7434b4773d31d709 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Thu, 26 Oct 2017 14:00:42 +0200
Subject: [PATCH] repo 1
---
global/overlay/etc/puppet/cosmos-rules.yaml | 4 ++++
global/overlay/etc/puppet/manifests/cosmos-site.pp | 4 ++--
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 6c1e97ef..1a16a9b5 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -10,6 +10,10 @@ jmp.komreg.se:
sunet_iaas_cloud:
autoupdate:
+r1.komreg.se:
+ sunet_iaas_cloud:
+ autoupdate:
+
'^eidas-node-[0-9]+\.qa\.sveidas\.se$':
openstack_ubuntu_16_04_dockerhost:
sunet_iaas_cloud:
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 188115ad..85978121 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -138,7 +138,7 @@ class saml_metadata($filename=undef, $cert=undef, $url=undef) {
sunet::metadata { "$filename": url => $url, cert => $cert }
}
-class swamid_metadata_repo($hostname=undef) {
+class md_repo_client($hostname=undef) {
$host = $hostname ? {
undef => $title,
default => $hostname
@@ -151,7 +151,7 @@ class swamid_metadata_repo($hostname=undef) {
}
}
-class swamid_md_master($hostname) {
+class md_repo_server($hostname) {
class {'openstack_ubuntu_16_04_dockerhost': } ->
class {'sunet::gitolite': } ->
sunet::docker_run {'gitweb':