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

add support for Amazon Linux to puppet_agent::osfamily::redhat #85

Merged
merged 1 commit into from Mar 14, 2016

Conversation

oshaughnessy
Copy link
Contributor

Amazon Linux looks enough like CentOS 6 that we can treat it that way for purposes of upgrading the puppet agent RPM. The end result of the change is that on Amazon Linux releases, the module configures the yum "pc1_repo" baseurl to the "el-6-${::architecture}" subdirectory instead of something
like "el-2015-x86_64" or "el-2014-x86_64".

This was tested on Amazon Linux 2015.03 and 2014.09.

Amazon Linux looks enough like CentOS 6 that we can treat it that way for
purposes of upgrading the puppet agent RPM. The end result of the change is
that on Amazon Linux releases, the module configures the yum "pc1_repo"
baseurl to the "el-6-${::architecture}" subdirectory instead of something
like "el-2015-x86_64" or "el-2014-x86_64".
@MikaelSmith
Copy link
Contributor

I'd like to see an update to test osfamily=Amazon in https://github.com/puppetlabs/puppetlabs-puppet_agent/blob/master/spec/classes/puppet_agent_osfamily_redhat_spec.rb#L4 along with this change.

It would probably just require adding an entry that looks like ['Amazon', 'el/6'].

@MikaelSmith
Copy link
Contributor

@highb mind giving this a look? I'm fine merging it and putting up a new PR to add specs.

@highb
Copy link
Contributor

highb commented Mar 14, 2016

@MikaelSmith @oshaughnessy I'm not very familiar with AWS's images; are they all el-6 derivatives? Is there any possibility that it would be a different version that we would need to account for?

@MikaelSmith
Copy link
Contributor

I believe it's el-6 now, but that could certainly change in the future. I can fire up an Amazon AMI, we may be able to detect major version on it in a way that will (hopefully) stay relevant.

@MikaelSmith
Copy link
Contributor

I don't see an obvious way to detect which EL release an Amazon AMI is based on. Maybe it should be restricted to the 2015.09 release?

@highb
Copy link
Contributor

highb commented Mar 14, 2016

Or we document that it has only been tested on 2015.09. Amazon releases new AMIs fairly frequently, right? It would be a bit of overhead to keep that version up to date, if so.

MikaelSmith pushed a commit that referenced this pull request Mar 14, 2016
add support for Amazon Linux to puppet_agent::osfamily::redhat
@MikaelSmith MikaelSmith merged commit f673f1c into puppetlabs:master Mar 14, 2016
@oshaughnessy
Copy link
Contributor Author

Thanks, guys. Sorry I didn't jump back in here in time to add a spec addition.

@MikaelSmith
Copy link
Contributor

That's ok, I added some as part of #92.

I also fixed up the OSS repo creation to correctly identify EL 6. I'm not sure that really helps anyone, because if they're using AMIs they're probably using the Puppet3/Facter2 packages, and puppet-agent conflicts with them.

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