From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 29 Jul 2016 15:02:15 +0000 (+0000)
Subject: Transfer onion hostname info to puppet master
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=64b4b975f9581f52656f8efa15624ab0593b2485;hp=705850831e5b2cea9d62f92bb6d234e87572e326;p=mirror%2Fdsa-puppet.git

Transfer onion hostname info to puppet master
---

diff --git a/modules/onion/manifests/balance.pp b/modules/onion/manifests/balance.pp
index 2d7257383..4019e2665 100644
--- a/modules/onion/manifests/balance.pp
+++ b/modules/onion/manifests/balance.pp
@@ -29,4 +29,10 @@ class onion::balance {
 		order   => 05,
 		content => "services:\n",
 	}
+
+	@@concat::fragment { "onion::balance::onionbalance-services.yaml":
+		target  => "/srv/puppet.debian.org/puppet-facts/onionbalance-services.yaml",
+		content => $onion_balance_service_hostname,
+		tag     => "onionbalance-services.yaml",
+	}
 }
diff --git a/modules/puppetmaster/manifests/init.pp b/modules/puppetmaster/manifests/init.pp
index f1c567dcc..f16e715bb 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -16,4 +16,11 @@ class puppetmaster {
 		description     => 'Allow puppet access',
 		rule            => '&SERVICE_RANGE(tcp, 8140, $HOST_DEBIAN_V6)'
 	}
+
+	file { '/srv/puppet.debian.org/puppet-facts':
+		ensure => directory
+	}
+	concat { '/srv/puppet.debian.org/puppet-facts/onionbalance-services.yaml':
+	}
+	Concat::Fragment <<| tag == "onionbalance-services.yaml" |>>
 }