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

Update chkconfig for xinetd based services #34270

Merged
merged 1 commit into from
Jul 16, 2016
Merged

Update chkconfig for xinetd based services #34270

merged 1 commit into from
Jul 16, 2016

Conversation

mattlindesay
Copy link
Contributor

What does this PR do?

Fixes chkconfig check for Redhat 6 xinetd based services

What issues does this PR fix or reference?

The existing module doesn't detected enabled/disabled chkconfig services

Previous Behavior

Always returns False for xinetd services

New Behavior

Correctly returns True for enabled xinetd services

Tests written?

Yes - modified the existing rh_service.py test

Please review Salt's Contributing Guide for best practices.

Enabled xinetd based services report as on but the existing code is looking for : on

Enabled xinetd based services report as <service> on but the existing code is looking for <service>: on
@cachedout
Copy link
Contributor

@jfindlay It looks like this change was yours. Could you please take a look at this?

@mattlindesay
Copy link
Contributor Author

mattlindesay commented Jun 24, 2016

Will do. Thanks

Matt Lindesay

@cachedout
Copy link
Contributor

Bump again @jfindlay

@rallytime
Copy link
Contributor

@jfindlay one more bump to look at this.

@jfindlay
Copy link
Contributor

Looks fine to me.

@cachedout
Copy link
Contributor

Go Go Jenkins!

1 similar comment
@cachedout
Copy link
Contributor

Go Go Jenkins!

rallytime pushed a commit to rallytime/salt that referenced this pull request Jul 16, 2016
@rallytime rallytime merged commit 4acb2a6 into saltstack:develop Jul 16, 2016
rallytime pushed a commit that referenced this pull request Jul 16, 2016
Update mock value to match change in #34270.
gitebra pushed a commit to gitebra/salt that referenced this pull request Jul 18, 2016
* upstream/develop: (97 commits)
  Document how to test for the existence of a log message (saltstack#34738)
  Use six.iteritems instead of iteritems() in configcomparer
  Use six.iteritems instead of iteritems() in etcd_util
  Use six.iteritems instead of iteritems() in psutil_compat
  Use six.iteritems instead of iteritems() in junos grains
  Use six.iteritems instead of iteritems() in vultrpy driver
  Use six.iteritems instead of iteritems() in profitbricks driver
  Use six.iteritems instead of iteritems() in nova driver
  Use six.iteritems instead of iteritems() in linode driver
  Use six.iteritems instead of iteritems() in ec2 driver
  modules/ebuild: Add handling for InvalidAtom exception (saltstack#34727)
  Add valid function to mine module.
  Loop over updated keys in non recursive update
  Update mock value to match change in saltstack#34270.
  Add versionadded to "special" option in cron.present state (saltstack#34707)
  NILinuxRT fix timezone module (saltstack#34710)
  Add state module to manage InfluxDB databases
  Add state module to manage InfluxDB users
  Add influx module for InfluxDB 0.9+
  Normalise function argument formatting
  ...
@mattlindesay mattlindesay deleted the patch-1 branch August 22, 2016 13:42
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