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

Use os structured fact instead of flat lsb facts #43

Merged
merged 1 commit into from
May 8, 2018

Conversation

traylenator
Copy link
Contributor

Scientific Linux CERN version has an
operatingsystem SLC on clone version 6.

@bastelfreak
Copy link
Member

Thanks for the PR @traylenator, can you check the issues that travis found?

@bastelfreak bastelfreak added the enhancement New feature or request label Feb 7, 2018
@brwyatt
Copy link
Contributor

brwyatt commented Feb 10, 2018

I don't think the build issues are related to the changes in this PR (or any of the other PRs). I looks (to me) that there's a few broken Ruby Gems getting pulled/used, or possibly issues with the metadata.json file.

Ruby versions before 2.x seem to be throwing a syntax error in the metadata-json-lint gem
Ruby versions 2.x are failing to find the semantic_puppet gem, then throw a warning about the 'pe' requirement in metadata.json no longer being supported by the forge.

So it looks like the fix will either be to remove support for Ruby <2.x, or use an older, more compatible, version of metadata-json-lint, add semantic_puppet to the Gemfile (I think), and remove/update the 'pe' requirement in metadata.json.

Either way, doesn't appear to be an issue with the changes in this PR, just looks like some Gems and metadata.json requirements were updated underneath the repo.

@bastelfreak
Copy link
Member

@traylenator we recently did a modulesync. Can you please rebase?

@traylenator
Copy link
Contributor Author

Happy to covert this to osfamily since so many changes going through anyway.

@traylenator traylenator changed the title Enable suport for Scientific Linux CERN Use os structured fact instead of flat lsb facts May 7, 2018
@traylenator traylenator requested a review from ekohl May 7, 2018 13:54
Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

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

Makes sense.

'Ubuntu': {
case $::lsbdistcodename {
'Debian': {
case $facts['os']['release']['major'] {
Copy link
Member

Choose a reason for hiding this comment

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

While you're at it, maybe change this to a simple if since there's just 1 case?

Use structured os fact and in particular make use
of osfamily to avoid listing redhat clones.
@traylenator
Copy link
Contributor Author

And rebased.

@juniorsysadmin juniorsysadmin merged commit eb9f88e into voxpupuli:master May 8, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants