Merge pull request #832 from sorreltree/remove_storeconfigs_warning_o…

…n_puppet_apply Remove storeconfigs warning on puppet apply
voxpupuli · Jul 20, 2016 · e54f4dc · e54f4dc
2 parents 265f864 + 03b4ac5
commit e54f4dc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/manifests/resource/upstream.pp b/manifests/resource/upstream.pp
@@ -97,8 +97,10 @@
       content => template('nginx/conf.d/upstream_members.erb'),
     }
   } else {
-    # Collect exported members:
-    ::Nginx::Resource::Upstream::Member <<| upstream == $name |>>
+    class { 'nginx::resource::upstream::collect':
+      # Collect exported members
+      upstream_name => $name,
+    }
   }
 
   concat::fragment { "${name}_upstream_footer":

diff --git a/manifests/resource/upstream/collect.pp b/manifests/resource/upstream/collect.pp
@@ -0,0 +1,12 @@
+# Class to collect exported upstream members, if needed.
+#
+# This is separated into a separate class in order to remove errors if
+# storeconfigs are unavailable.
+
+class nginx::resource::upstream::collect (
+  $upstream_name,
+)
+{
+  # Collect exported members:
+  ::Nginx::Resource::Upstream::Member <<| upstream == $upstream_name |>>
+}