Browse Source

Merge pull request #832 from sorreltree/remove_storeconfigs_warning_on_puppet_apply

Remove storeconfigs warning on puppet apply
Matthew Haughton 7 years ago
parent
commit
e54f4dcaa2
2 changed files with 16 additions and 2 deletions
  1. 4 2
      manifests/resource/upstream.pp
  2. 12 0
      manifests/resource/upstream/collect.pp

+ 4 - 2
manifests/resource/upstream.pp

@@ -97,8 +97,10 @@ define nginx::resource::upstream (
       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":

+ 12 - 0
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 |>>
+}