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

Merge 1.2.x #102

Merged
merged 50 commits into from Nov 12, 2014
Merged

Merge 1.2.x #102

merged 50 commits into from Nov 12, 2014

Conversation

underscorgan
Copy link
Contributor

No description provided.

Ashley Penney and others added 30 commits May 14, 2014 16:46
This is a compatibility release. No functional changes to this module
were made in this release, just testing infrastructure changes to extend
tests to RHEL7 and Ubuntu 14.04
Pin rspec ~> 2.99 due to bundle issues
…stake

Remove support for puppet:/// files.
openssl on sol 11 is in /usr/bin
Remove AIX 5.3 support as we can't test against it.
Capture back metadata.json reformating
Remove puppet_module_install in favor of copy_module_to
Colleen Murphy and others added 20 commits November 10, 2014 10:12
Stop starting puppet master unnecessarily and fix directory creation
and dependency installation.
Previously we removed the call to `puppet master` during acceptance
testing setup because it caused conflicts in agent-master multinode
setups. However, we realized that the reason for the call to `puppet
master` in the first place was so that java_ks could use the existing
puppet certs that exist on the puppet master. This patch refactors the
tests to generate a CA and private key itself. This avoids having tests
depend on a certain node configuration.

It also adds /usr/bin to the PATH on solaris so that the java_ks type
can use the openssl command in tests on solaris.
As long as basic_spec.rb runs before the other acceptance tests, we
don't need to include the java class in the other tests. This patch
removes the java class from the other tests since it is not supported
on solaris 10. It also fixes the PATH so that we can find ruby on
solaris 10, foss or PE.
This was failing on solaris, which doesn't need the module.
Also, update metadata, as tests succeeded on sles12
Conflicts:
	CHANGELOG.md
	Modulefile
	metadata.json
	spec/spec_helper_acceptance.rb
cyberious added a commit that referenced this pull request Nov 12, 2014
@cyberious cyberious merged commit e94ef2d into puppetlabs:master Nov 12, 2014
@underscorgan underscorgan deleted the merge_1.2.x branch November 12, 2014 18:00
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.

None yet

4 participants