Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove storeconfigs warning on puppet apply #832

Merged

Conversation

sorreltree
Copy link
Contributor

@sorreltree sorreltree commented Jul 14, 2016

This is an attempt to fix issue #720 . I can only do minimal testing as I don't have a master environment to test with. I believe this should fix the issue and retain functionality, based on other modules that have addressed the same problem.

Fixes #720

@3flex
Copy link
Contributor

3flex commented Jul 15, 2016

Sounds reasonable, based on what I've seen in ssm/ssm-munin#33 for example.

I'd really like someone to test this though! I don't have a master setup currently either. Will ask in thread for #720.

@3flex
Copy link
Contributor

3flex commented Jul 15, 2016

In the meantime, can you please squash the commits to a single commit? Thank you!

@sorreltree sorreltree force-pushed the remove_storeconfigs_warning_on_puppet_apply branch from afb93b8 to 03b4ac5 Compare July 15, 2016 16:13
@sorreltree
Copy link
Contributor Author

Sorry about the multiple commits -- I thought I had them squashed.

Should be squashed now.

@sorreltree
Copy link
Contributor Author

Since I can verify that the patch does in fact disable the error, and since upstream inclusion seems to be well tested in the Travis tests (see block below), I'm bumping this pull request for reconsideration.

nginx::resource::upstream

  os-independent items

    basic assumptions

      should contain Concat[/etc/nginx/conf.d/upstream-test-upstream.conf]

      should contain Concat::Fragment[upstream-test_upstream_header] with content =~ /upstream upstream-test/

      should contain Concat::Fragment[upstream-test_upstream_header] with target => "/etc/nginx/conf.d/upstream-test-upstream.conf" and order => 10

      should contain Concat::Fragment[upstream-test_upstream_members] with target => "/etc/nginx/conf.d/upstream-test-upstream.conf" and order => 50

      should contain Concat::Fragment[upstream-test_upstream_footer] with target => "/etc/nginx/conf.d/upstream-test-upstream.conf", order => 90 and content  supplied string

    upstream.conf template content

      when upstream_cfg_prepend is {"test3"=>"test value 3", "test6"=>{"subkey1"=>["subvalue1", "subvalue2"]}, "test1"=>"test value 1", "test2"=>"test value 2", "test5"=>{"subkey1"=>"subvalue1"}, "test4"=>["test value 1", "test value 2"]}

        should contain Concat[/etc/nginx/conf.d/upstream-test-upstream.conf] with mode => "0644"

        should contain Concat::Fragment[upstream-test_upstream_header]

        should contain ordered prepended directives

      when members is ["test3", "test1", "test2"]

        should contain Concat[/etc/nginx/conf.d/upstream-test-upstream.conf] with mode => "0644"

        should contain Concat::Fragment[upstream-test_upstream_members]

        should set server

      when ensure => absent

        should contain Concat[/etc/nginx/conf.d/upstream-test-upstream.conf] with ensure => "absent"

@3flex 3flex merged commit e54f4dc into voxpupuli:master Jul 20, 2016
@sorreltree sorreltree deleted the remove_storeconfigs_warning_on_puppet_apply branch August 2, 2016 18:59
@sorreltree
Copy link
Contributor Author

Yay!

Slm0n87 pushed a commit to Slm0n87/puppet-nginx that referenced this pull request Mar 7, 2019
…warning_on_puppet_apply

Remove storeconfigs warning on puppet apply
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"You cannot collect exported resources without storeconfigs being set" at manifests/resource/upstream.pp:89:5
2 participants