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

Fixes for rhel based pkgs #418

Merged
merged 4 commits into from
Mar 18, 2017
Merged

Fixes for rhel based pkgs #418

merged 4 commits into from
Mar 18, 2017

Conversation

jjasghar
Copy link
Contributor

  • fixes for rhel based pkgs

Signed-off-by: JJ Asghar jj@chef.io

- fixes for rhel based pkgs

Signed-off-by: JJ Asghar <jj@chef.io>
when > '6'
default['rabbitmq']['rpm_package'] = "rabbitmq-server-#{node['rabbitmq']['version']}-1.el6..noarch.rpm"
when < '6'
default['rabbitmq']['rpm_package'] = "rabbitmq-server-#{node['rabbitmq']['version']}-1.el7.noarch.rpm"
Copy link
Member

Choose a reason for hiding this comment

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

This looks like a typo? For versions < 6 this uses the CentOS 7 package?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

opps. thanks :)

Copy link
Member

Choose a reason for hiding this comment

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

Also, we should cover the case where version equals 6? ;)

default['rabbitmq']['rpm_package'] = "rabbitmq-server-#{node['rabbitmq']['version']}-1.el7.noarch.rpm"
end
when 'suse'
default['rabbitmq']['rpm_package'] = "rabbitmq-server-#{node['rabbitmq']['version']}-1.suse..noarch.rpm"
Copy link
Member

Choose a reason for hiding this comment

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

Is there an extra dot before the noarch?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

@michaelklishin
Copy link
Member

@jjasghar thank you! I see a couple of suspicious things (likely typos) in this PR.

JJ Asghar added 2 commits March 17, 2017 16:45
Typos

Signed-off-by: JJ Asghar <jj@chef.io>
.

Signed-off-by: JJ Asghar <jj@chef.io>
case node['platform_family']
when 'rhel', 'fedora'
case node['platform_version']
when < '6'
Copy link
Member

Choose a reason for hiding this comment

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

I think this should be <= as currently version 6 will match the other branch.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ah, makes sense.

missed =

Signed-off-by: JJ Asghar <jj@chef.io>
@jjasghar jjasghar merged commit f0d5958 into master Mar 18, 2017
@jjasghar jjasghar deleted the 4.11.1 branch March 18, 2017 18:37
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.

2 participants