opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #832 from sorreltree/remove_storeconfigs_warning_on_puppet_apply

Browse source 
Remove storeconfigs warning on puppet apply
This commit is contained in:
Matthew Haughton 2016-07-20 15:08:15 -04:00 committed by GitHub
commit e54f4dcaa2
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
manifests/resource/upstream.pp
View file

@ -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
manifests/resource/upstream/collect.pp Normal file
View file

@ -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 |>>
}