Updated Branches: refs/heads/trunk 764e5dcc5 -> b2f197d36
WHIRR-715. Fixing Puppet unit test failure. Contributed by Roman Shaposhnik. Project: http://git-wip-us.apache.org/repos/asf/whirr/repo Commit: http://git-wip-us.apache.org/repos/asf/whirr/commit/b2f197d3 Tree: http://git-wip-us.apache.org/repos/asf/whirr/tree/b2f197d3 Diff: http://git-wip-us.apache.org/repos/asf/whirr/diff/b2f197d3 Branch: refs/heads/trunk Commit: b2f197d360a9dbacb4cb0db3739f4806334f2654 Parents: 764e5dc Author: Andrew Bayer <andrew.ba...@gmail.com> Authored: Thu Apr 11 14:57:25 2013 -0700 Committer: Andrew Bayer <andrew.ba...@gmail.com> Committed: Thu Apr 11 14:57:25 2013 -0700 ---------------------------------------------------------------------- .../src/test/resources/nginx-with-attribs.txt | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/whirr/blob/b2f197d3/services/puppet/src/test/resources/nginx-with-attribs.txt ---------------------------------------------------------------------- diff --git a/services/puppet/src/test/resources/nginx-with-attribs.txt b/services/puppet/src/test/resources/nginx-with-attribs.txt index 0bd63da..eb5f0b4 100644 --- a/services/puppet/src/test/resources/nginx-with-attribs.txt +++ b/services/puppet/src/test/resources/nginx-with-attribs.txt @@ -1,9 +1,14 @@ rm /etc/puppet/manifests/site.pp rm /etc/puppet/manifests/extdata/common.csv -cat >> /etc/puppet/manifests/extdata/common.csv <<-'END_OF_JCLOUDS_FILE' +rm /etc/puppet/hieradata/common.yaml +cat > /etc/puppet/hieradata/common.yaml <<-'END_OF_JCLOUDS_FILE' + nginx::server: + - 127.0.0.1 +END_OF_JCLOUDS_FILE +cat > /etc/puppet/manifests/extdata/common.csv <<-'END_OF_JCLOUDS_FILE' nginx::server,127.0.0.1 END_OF_JCLOUDS_FILE -cat >> /etc/puppet/manifests/site.pp <<-'END_OF_JCLOUDS_FILE' +cat > /etc/puppet/manifests/site.pp <<-'END_OF_JCLOUDS_FILE' $extlookup_datadir='/etc/puppet/manifests/extdata' $extlookup_precedence = ['common'] node default {
