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

sheild ssl + credentials pickup from pabrahamsson #60

Merged
merged 1 commit into from
Nov 10, 2015
Merged

sheild ssl + credentials pickup from pabrahamsson #60

merged 1 commit into from
Nov 10, 2015

Conversation

bilsch
Copy link

@bilsch bilsch commented Nov 6, 2015

#48 is the original pull request. I was having problems getting the merge to go cleanly so just manually re-crafted. Props for the code should go to pabrahamsson

Main changes not in pabrahamsson change set was a lint change for manifests/service.pp. I changed the kibana_elasticsearch_username ... and stripped off the kibana_ prefix, overly wordy IMO.

rake test results from local

 rake test
---> syntax:manifests
---> syntax:templates
---> syntax:hiera:yaml
metadata-json-lint metadata.json
metadata-json-lint metadata.json
Notice: Preparing to install into /Users/bschwanitz/gits/cmm/evenup-kibana/spec/fixtures/modules ...
Notice: Downloading from https://forgeapi.puppetlabs.com ...
Notice: Installing -- do not interrupt ...
/Users/bschwanitz/gits/cmm/evenup-kibana/spec/fixtures/modules
└── maestrodev-wget (v1.7.1)
Notice: Preparing to install into /Users/bschwanitz/gits/cmm/evenup-kibana/spec/fixtures/modules ...
Notice: Downloading from https://forgeapi.puppetlabs.com ...
Warning: Symlinks in modules are unsupported. Please investigate symlink puppetlabs-stdlib-4.2.0/spec/acceptance/nodesets/default.yml->centos-64-x64.yml.
Notice: Installing -- do not interrupt ...
/Users/bschwanitz/gits/cmm/evenup-kibana/spec/fixtures/modules
└── puppetlabs-stdlib (v4.2.0)
/Users/bschwanitz/.rbenv/versions/2.1.2/bin/ruby -I/Users/bschwanitz/.rbenv/versions/2.1.2/lib/ruby/gems/2.1.0/gems/rspec-support-3.1.2/lib:/Users/bschwanitz/.rbenv/versions/2.1.2/lib/ruby/gems/2.1.0/gems/rspec-core-3.1.7/lib /Users/bschwanitz/.rbenv/versions/2.1.2/lib/ruby/gems/2.1.0/gems/rspec-core-3.1.7/exe/rspec --pattern spec/\{classes,defines,unit,functions,hosts,integration,types\}/\*\*/\*_spec.rb --color
WARN: Unresolved specs during Gem::Specification.reset:
      rake (>= 0)
WARN: Clearing out unresolved specs.
Please report a bug if this causes problems.
............................

Finished in 4.37 seconds (files took 1.16 seconds to load)
28 examples, 0 failures

#48 is the original pull request. I was having problems getting the merge to go cleanly so just manually re-crafted. Props for the code should go to pabrahamsson

Only change not in pabrahamsson change set was a lint change for manifests/service.pp
jlambert121 added a commit that referenced this pull request Nov 10, 2015
sheild ssl + credentials pickup from pabrahamsson
@jlambert121 jlambert121 merged commit 85527fb into jlambert121:master Nov 10, 2015
@jlambert121
Copy link
Owner

Thanks for reworking this. Closes #48

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.

2 participants