From 96ef4273241d79427bb0b252fb759affec85db14 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 14 Jun 2016 20:46:38 +0200 Subject: [bug] Fix site_obfsproxy services variable lookup After including everything into a `node default` scope in puppet/manifests/site.pp to make puppet-catalog-test happy (see commit 62ea45d47), we get this error: Error: member(): Requires array to work with at /srv/leap/puppet/modules/site_obfsproxy/manifests/init.pp:14 Moving the `services` hiera avaluation out of the node scope back to top level scope will solve this. --- puppet/manifests/site.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'puppet') diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index 4b0ad459..3bf6a5c1 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -1,3 +1,7 @@ +$services = hiera('services', []) +$services_str = join($services, ', ') +notice("Services for ${fqdn}: ${services_str}") + node default { # set a default exec path # the logoutput exec parameter defaults to "on_error" in puppet 3, @@ -11,10 +15,6 @@ node default { install_options => ['--no-install-recommends'], } - $services = hiera('services', []) - $services_str = join($services, ', ') - notice("Services for ${fqdn}: ${services_str}") - # In the default deployment case, we want to run an 'apt-get dist-upgrade' # to ensure the latest packages are installed. This is done by including the # class 'site_config::slow' here. However, you only changed a small bit of -- cgit v1.2.3