From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 22 Sep 2019 19:18:12 +0000 (+0200)
Subject: avoid duplicate ssh keygen for snapshot
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=d4807d8033e6c048de2e6cdbe562dc791ecc92e8;p=mirror%2Fdsa-puppet.git

avoid duplicate ssh keygen for snapshot
---

diff --git a/modules/roles/manifests/snapshot_master.pp b/modules/roles/manifests/snapshot_master.pp
index eeb74f7d9..e976cdc44 100644
--- a/modules/roles/manifests/snapshot_master.pp
+++ b/modules/roles/manifests/snapshot_master.pp
@@ -1,8 +1,8 @@
 # snapshot master
 class roles::snapshot_master {
   include roles::snapshot_base
+  include roles::snapshot_ssh_keygen
 
-  ssh::keygen {'snapshot': }
   ssh::authorized_key_add { 'roles::snapshot_master::to::farmsync_target':
     target_user => 'snapshot',
     key         => dig($facts, 'ssh_keys_users', 'snapshot', 'id_rsa.pub', 'line'),
diff --git a/modules/roles/manifests/snapshot_secondary.pp b/modules/roles/manifests/snapshot_secondary.pp
index f4ef77da0..e53c267bc 100644
--- a/modules/roles/manifests/snapshot_secondary.pp
+++ b/modules/roles/manifests/snapshot_secondary.pp
@@ -4,6 +4,7 @@
 # like sync targets or web mirrors.
 class roles::snapshot_secondary {
   include roles::snapshot_base
+  include roles::snapshot_ssh_keygen
 
   ssh::keygen {'snapshot': }
 
diff --git a/modules/roles/manifests/snapshot_ssh_keygen.pp b/modules/roles/manifests/snapshot_ssh_keygen.pp
new file mode 100644
index 000000000..d9b80cc99
--- /dev/null
+++ b/modules/roles/manifests/snapshot_ssh_keygen.pp
@@ -0,0 +1,4 @@
+# create the ssh key for snapshot
+class roles::snapshot_ssh_keygen {
+  ssh::keygen {'snapshot': }
+}