From 17533f04913188a47801775f493b838c71e2f8de Mon Sep 17 00:00:00 2001
From: Maria Haider <mariah@nordu.net>
Date: Wed, 4 Jul 2018 10:06:39 +0200
Subject: [PATCH 1/2] Added root/.ssh directory in 'reinstall::keep' manifest
---
global/overlay/etc/puppet/manifests/cosmos-site.pp | 1 +
1 file changed, 1 insertion(+)
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 9305d435..ae4f0ca6 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -121,6 +121,7 @@ class saml_metadata($filename=undef, $cert=undef, $url=undef) {
class md_repo_client {
sunet::snippets::reinstall::keep {'/etc/metadata': } ->
+ sunet::snippets::reinstall::keep {'/root/.ssh': } ->
sunet::ssh_git_repo {'/var/cache/metadata_r1':
username => 'root',
group => 'root',
From 5e1910e2930049661e9a438234c3d7242aa61d0e Mon Sep 17 00:00:00 2001
From: Maria Haider <mariah@nordu.net>
Date: Wed, 4 Jul 2018 10:21:54 +0200
Subject: [PATCH 2/2] Put the directories in array
---
global/overlay/etc/puppet/manifests/cosmos-site.pp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index ae4f0ca6..cc327785 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -120,8 +120,7 @@ class saml_metadata($filename=undef, $cert=undef, $url=undef) {
}
class md_repo_client {
- sunet::snippets::reinstall::keep {'/etc/metadata': } ->
- sunet::snippets::reinstall::keep {'/root/.ssh': } ->
+ sunet::snippets::reinstall::keep {['/etc/metadata','/root/.ssh']: } ->
sunet::ssh_git_repo {'/var/cache/metadata_r1':
username => 'root',
group => 'root',