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 Solaris 11 support. #177

Merged
merged 1 commit into from Jul 25, 2014
Merged

Conversation

ody
Copy link
Member

@ody ody commented Jul 11, 2014

This commit is a simple change to Class['ntp::params'] which adds a
selector to the default Solaris data so that the proper package name
is managed on Solaris 11.

With out this small change Solaris 11 hosts will attempt to improperly
install package names following the old Solaris 10 standard.

@@ -136,7 +136,10 @@
$config = '/etc/inet/ntp.conf'
$driftfile = '/var/ntp/ntp.drift'
$keys_file = '/etc/inet/ntp.keys'
$package_name = [ 'SUNWntpr', 'SUNWntpu' ]
$package_name = $operatingsystemrelease ? {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you use $::operatingsystemrelease here?

@hunner
Copy link
Contributor

hunner commented Jul 11, 2014

@ody
Copy link
Member Author

ody commented Jul 18, 2014

The only one I didn't do is https://github.com/puppetlabs/puppetlabs-ntp/blob/master/spec/classes/ntp_spec.rb#L253 because it doesn't matter if the operating system release is 5.10 or 5.11.

  This commit is a simple change to Class['ntp::params'] which adds a
  selector to the default Solaris data so that the proper package name
  is managed on Solaris 11.

  With out this small change Solaris 11 hosts will attempt to improperly
  install package names following the old Solaris 10 standard.
@ody
Copy link
Member Author

ody commented Jul 18, 2014

nvm. Added

else
packagename = 'ntp'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we removing the default assumption that the package is called ntp?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point...

underscorgan pushed a commit that referenced this pull request Jul 25, 2014
@underscorgan underscorgan merged commit 1d65ae1 into puppetlabs:master Jul 25, 2014
@underscorgan
Copy link
Contributor

See #184

@ody ody deleted the solaris_11_support branch July 25, 2014 23: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