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

Use modulepath from environment.conf if available #20

Merged
merged 15 commits into from
Nov 17, 2016

Conversation

kpaulisse
Copy link
Contributor

@kpaulisse kpaulisse commented Nov 8, 2016

Overview

This pull request checks environment.conf (if available) and uses the modulepath to inform its lookup locations for the --compare-file-text option.

Fixes #12

Checklist

  • Make sure that all of the tests pass, and fix any that don't. Just run rake in your checkout directory, or review the CI job triggered whenever you push to a pull request.
  • Make sure that there is 100% test coverage by running rake coverage:spec or ignoring untestable sections of code with # :nocov comments. If you need help getting to 100% coverage please ask; however, don't just submit code with no tests.
  • If you have added a new command line option, we would greatly appreciate a corresponding integration test that exercises it from start to finish. This is optional but recommended.

/cc @eelcomaljaars who originally reported the problem. Can you see if this code fixes the problem without your symlink workaround?

@systeemkabouter
Copy link

Hi @kpaulisse , switched to the branch and ran the job again without the symlinks, seems mostly ok. I did get a few new warnings that might need attention :

Previous output of this job :

I, [2016-11-09T07:17:33.832042 #91999] INFO -- : Catalogs compiled for [REDACTED]
I, [2016-11-09T07:17:34.598840 #91999] INFO -- : Diffs computed for [REDACTED]
diff production/[REDACTED] fea-puppetv4/[REDACTED]


Package[tcpdump] =>
parameters =>
ensure =>
- present
+ absent


New output on the branch :

W, [2016-11-09T07:20:39.047633 #93417] WARN -- : WARNING: Hiera datadir for yaml doesn't seem to exist at /var/folders/6n/8xsv9cv56h3d6pg5mfx5gx1c0000gr/T/d20161109-93417-cnatq4environments/production/hieradata
W, [2016-11-09T07:20:40.177171 #93418] WARN -- : WARNING: Hiera datadir for yaml doesn't seem to exist at /var/folders/6n/8xsv9cv56h3d6pg5mfx5gx1c0000gr/T/d20161109-93418-366vwrenvironments/production/hieradata
I, [2016-11-09T07:20:48.810370 #93413] INFO -- : Catalogs compiled for [REDACTED]
I, [2016-11-09T07:20:49.431704 #93413] INFO -- : Diffs computed for [REDACTED]
diff production/[REDACTED] fea-puppetv4/[REDACTED]


Package[tcpdump] =>
parameters =>
ensure =>
- present
+ absent


Thanks for your work on this!

@kpaulisse
Copy link
Contributor Author

W, [2016-11-09T07:20:39.047633 #93417] WARN -- : WARNING: Hiera datadir for yaml doesn't seem to exist at /var/folders/6n/8xsv9cv56h3d6pg5mfx5gx1c0000gr/T/d20161109-93417-cnatq4environments/production/hieradata

There seems to be a missing / somewhere.

Are you using settings[:hiera_path_strip]? If so, does your value have a trailing /?

e.g.

# Bad
settings[:hiera_path_strip] = '/etc/puppetlabs/code/'

# Good
settings[:hiera_path_strip] = '/etc/puppetlabs/code'

@systeemkabouter
Copy link

Yes that was it. Thanks.

@kpaulisse kpaulisse merged commit 5263d00 into master Nov 17, 2016
@kpaulisse kpaulisse deleted the kpaulisse-modulepath branch November 17, 2016 17:08
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.

run fails complaining that a puppet:/// file resource cannot be found
2 participants