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

Fix Apt Repo Settings #68

Merged
merged 1 commit into from
Sep 5, 2015
Merged

Conversation

grubernaut
Copy link
Contributor

This allows kitchen-puppet to determine the correct apt repo to use when
installing Puppet, instead of requiring manual user settings.

Doing this, however, deprecates the configuration of puppet-platform,
as this is now set from the platform configuration in
.kitchen.yml.

I have left the default puppet_apt_repo configuration parameter set to
ubuntu precise. I can be convinced fairly easily to change this to
trusty, yet I don't really see the benefit after the merge of this
patch, as kitchen-puppet will now install the correct apt repo based
on the test-suite's platform without further configuration.

Due to this deprecation we will likely need to increase the minor version from
0 to 1 according to semver rules. cc: @neillturner

As discovered in Issue #67, the puppet repo for ubuntu-precise still
allowed for installation of the hiera-puppet package. This package is
no longer needed if running a version of Puppet 3.x.x or greater.

To circumvent this issue, we no longer install the hiera-puppet
package by default, instead only installing this package when the
install_hiera configuration flag is toggled.

Hiera will still be installed by the puppet-common package for any
version of puppet that is > 3.x.x

This allows kitchen-puppet to determine the correct apt repo to use when
installing Puppet, instead of requiring manual user settings.

Doing this, however, deprecates the configuration of `puppet-platform`,
as this is now set from the platform configuration in
`.kitchen.yml`.

I have left the default `puppet_apt_repo` configuration parameter set to
ubuntu precise. I can be convinced fairly easily to change this to
trusty, yet I don't really see the benefit after the merge of this
patch, as `kitchen-puppet` will now install the correct apt repo based
on the test-suite's platform without further configuration.

Due to this deprecation we will likely need to increase the minor version from
`0` to `1` according to semver rules. cc: @neillturner

As discovered in Issue neillturner#67, the puppet repo for ubuntu-precise still
allowed for installation of the `hiera-puppet` package. This package is
no longer needed if running a version of Puppet 3.x.x or greater.

To circumvent this issue, we no longer install the `hiera-puppet`
package by default, instead only installing this package when the
`install_hiera` configuration flag is toggled.

Hiera will still be installed by the `puppet-common` package for any
version of puppet that is > 3.x.x
@neillturner
Copy link
Owner

what happens to centos and redhat etc after this change?

@grubernaut
Copy link
Contributor Author

@ytsarev
Copy link

ytsarev commented Sep 4, 2015

let's write some specs for that ?

neillturner added a commit that referenced this pull request Sep 5, 2015
@neillturner neillturner merged commit 804974c into neillturner:master Sep 5, 2015
@neillturner
Copy link
Owner

getting error from travis https://travis-ci.org/neillturner/kitchen-puppet
lib/kitchen/provisioner/puppet_apply.rb:135:7: C: Pass &:platform_name as an argument to default_config instead of a block.
tried a couple of changes and can't get through the checks
need to read up on this
i think it is related to not passing a parameter

@grubernaut
Copy link
Contributor Author

How did you merge this? It changed the spacing and format of the code, making it fail rubocop lint tests. That's really weird though, that it passes on pull request then when merged the spacing was different. Haven't seen that one before.

And yes @ytsarev I would have liked to write some spec tests for this before merged, will add at a later date.

@grubernaut
Copy link
Contributor Author

Ah, haha we need to pin rubocop versions or update our code to match the new rubocop version.

The pull request ran with rubocop 0.33.0; and the master build ran with 0.34.0 And indeed, a new version was released before this was merged lol

@neillturner
Copy link
Owner

ok releasing this. The puppet agent version didn't get updated so it is falling further behind although i don't believe it is used much. Still I will try and bring it up to date so it is consistent when i get time and resources.

@grubernaut
Copy link
Contributor Author

The release number probably should have been 0.1.0 to conform to semver, but it should be fine.

I'll get some spec tests written for this later in the week

@ytsarev ytsarev mentioned this pull request Nov 6, 2015
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

3 participants