From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 22 Sep 2019 15:13:31 +0000 (+0200)
Subject: Do not ship sbin/mirror-health from the roles version while we migrate
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=703c296014e23beedfb75c1d45b4ad3f7a56e26a;p=mirror%2Fdsa-puppet.git

Do not ship sbin/mirror-health from the roles version while we migrate
---

diff --git a/modules/roles/manifests/mirror_health.pp b/modules/roles/manifests/mirror_health.pp
index 41a970d78..d4d0d625e 100644
--- a/modules/roles/manifests/mirror_health.pp
+++ b/modules/roles/manifests/mirror_health.pp
@@ -7,15 +7,15 @@ define roles::mirror_health (
 ) {
 	ensure_packages(['python3-requests'], { ensure => 'installed' })
 
-	if !defined(File['/usr/local/sbin/mirror-health']) {
-	        file { '/usr/local/sbin/mirror-health':
-		        source => 'puppet:///modules/roles/mirror_health/mirror-health',
-		        owner  => 'root',
-		        group  => 'root',
-		        mode   => '0555',
-                        notify  => Service["mirror-health-${check_service}"],
-                }
-        }
+#	if !defined(File['/usr/local/sbin/mirror-health']) {
+#	        file { '/usr/local/sbin/mirror-health':
+#		        source => 'puppet:///modules/roles/mirror_health/mirror-health',
+#		        owner  => 'root',
+#		        group  => 'root',
+#		        mode   => '0555',
+#                        notify  => Service["mirror-health-${check_service}"],
+#                }
+#        }
 
         file { "/etc/systemd/system/mirror-health-${check_service}.service":
 		owner   => 'root',