(PUP-5257) Update client init script for EL4 by geoffnichols · Pull Request #4252 · puppetlabs/puppet

geoffnichols · 2015-09-16T07:18:12Z

Prior to this commit, managing the AIO
puppet-agent's puppet service using
puppet resource fails on EL4.

Because EL4's /etc/init.d/functions do not
take pid as an argument, we're not able to
use the built-in 'status' or 'killproc'
functions, as these will check the status of
and/or kill the puppet resource process
itself.

This commit updates the EL init script to
allow use of puppet resource to manage the
puppet service on EL4, while continuing to
use the built-in 'status' and 'killproc'
functions on EL5 and EL6.

joshcooper · 2015-09-16T14:28:13Z

Ouch, this is the third puppet/mco service related issue. We'll be fixing https://tickets.puppetlabs.com/browse/PUP-5057 in the sprint starting today.

joshcooper · 2015-09-16T16:11:22Z

@geoffnichols Can we get a PUP ticket?

geoffnichols · 2015-09-16T17:35:14Z

@joshcooper Updated to add a PUP ticket.

haus · 2015-09-16T18:27:56Z

ext/redhat/client.init

Why do we even bother calling status if we're just going to set RETVAL to 3?

I think I was confused here. Update in progress...

geoffnichols · 2015-09-17T00:50:08Z

@haus @shrug Thanks, updated!

geoffnichols · 2015-09-17T02:29:00Z

ext/redhat/client.init

Hmm, this doesn't account for the "service dead but pid file exists" case.

shrug · 2015-09-18T00:13:17Z

We probably need to ensure that the pidfile is created as well in the EL-4 case

Prior to this commit, managing the AIO puppet-agent's puppet service using `puppet resource` fails on EL4. Because EL4's /etc/init.d/functions do not take pid as an argument, we're not able to use the built-in 'status' or 'killproc' functions, as these will check the status of and/or kill the `puppet resource` process itself. This commit updates the EL init script to allow use of `puppet resource` to manage the puppet service on EL4, while continuing to use the built-in 'status' and 'killproc' functions on EL5 and EL6.

geoffnichols · 2015-09-18T04:03:36Z

ext/redhat/client.init

@shrug Updated to ensure we're creating $piddir when starting the service.

shrug · 2015-09-18T04:09:30Z

👍

joshcooper · 2015-09-18T04:55:11Z

Is an mco fix needed as well? Once puppet and mco services can be managed on el/centos-4, we can revert e23bb92.

geoffnichols · 2015-09-18T17:02:16Z

@joshcooper It doesn't appear that an mco fix is needed.

ScottGarman · 2015-09-18T23:19:08Z

👍

geoffnichols · 2015-09-21T15:50:32Z

@joshcooper This has a couple of thumbs up from RE, but we'd like someone from Client to merge if this looks ok.

joshcooper · 2015-09-21T18:34:03Z

👍

[root@ctfpnqewvnhvebw init.d]# puppet resource service puppet ensure=running
Notice: /Service[puppet]/ensure: ensure changed 'stopped' to 'running'
service { 'puppet':
  ensure => 'running',
}
[root@ctfpnqewvnhvebw init.d]# puppet resource service puppet ensure=running
service { 'puppet':
  ensure => 'running',
}
[root@ctfpnqewvnhvebw init.d]# puppet resource service puppet
service { 'puppet':
  ensure => 'running',
  enable => 'false',
}
[root@ctfpnqewvnhvebw init.d]# service puppet status
puppet (pid 7012) is running...
[root@ctfpnqewvnhvebw init.d]# puppet resource service puppet ensure=stopped
Notice: /Service[puppet]/ensure: ensure changed 'running' to 'stopped'
service { 'puppet':
  ensure => 'stopped',
}
[root@ctfpnqewvnhvebw init.d]# puppet resource service puppet ensure=stopped
service { 'puppet':
  ensure => 'stopped',
}
[root@ctfpnqewvnhvebw init.d]# puppet resource service puppet
service { 'puppet':
  ensure => 'stopped',
  enable => 'false',
}
[root@ctfpnqewvnhvebw init.d]# service puppet status
puppet is stopped

…hat_client_init (PUP-5257) Update client init script for EL4

geoffnichols force-pushed the PE-12034/stable/update_redhat_client_init branch 2 times, most recently from 6fe16f7 to 45d83fb Compare September 16, 2015 14:11

geoffnichols changed the title ~~(maint) Update client init script for EL4~~ (PUP-5257) Update client init script for EL4 Sep 16, 2015

geoffnichols force-pushed the PE-12034/stable/update_redhat_client_init branch from 45d83fb to a502b9a Compare September 16, 2015 17:34

haus reviewed Sep 16, 2015
View reviewed changes

geoffnichols force-pushed the PE-12034/stable/update_redhat_client_init branch 2 times, most recently from 719baf2 to 4c7e29e Compare September 17, 2015 00:48

geoffnichols force-pushed the PE-12034/stable/update_redhat_client_init branch from 4c7e29e to c5c2e65 Compare September 17, 2015 02:16

geoffnichols reviewed Sep 17, 2015
View reviewed changes

ext/redhat/client.init Outdated

Copy link

Contributor Author

geoffnichols Sep 17, 2015

Choose a reason for hiding this comment

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

Hmm, this doesn't account for the "service dead but pid file exists" case.

geoffnichols force-pushed the PE-12034/stable/update_redhat_client_init branch 3 times, most recently from 60670bf to 55da2ff Compare September 17, 2015 15:15

joshcooper added the Unix label Sep 17, 2015

geoffnichols force-pushed the PE-12034/stable/update_redhat_client_init branch from 55da2ff to 417d667 Compare September 18, 2015 00:30

geoffnichols force-pushed the PE-12034/stable/update_redhat_client_init branch from 417d667 to 5b9835f Compare September 18, 2015 00:35

geoffnichols reviewed Sep 18, 2015
View reviewed changes

ext/redhat/client.init

Copy link

Contributor Author

geoffnichols Sep 18, 2015

Choose a reason for hiding this comment

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

@shrug Updated to ensure we're creating $piddir when starting the service.

joshcooper added a commit that referenced this pull request Sep 21, 2015

Merge pull request #4252 from geoffnichols/PE-12034/stable/update_red…

3e21f90

…hat_client_init (PUP-5257) Update client init script for EL4

joshcooper merged commit 3e21f90 into puppetlabs:stable Sep 21, 2015

Conversation

geoffnichols commented Sep 16, 2015

Uh oh!

joshcooper commented Sep 16, 2015

Uh oh!

joshcooper commented Sep 16, 2015

Uh oh!

geoffnichols commented Sep 16, 2015

Uh oh!

haus Sep 16, 2015

Choose a reason for hiding this comment

Uh oh!

geoffnichols Sep 16, 2015

Choose a reason for hiding this comment

Uh oh!

geoffnichols commented Sep 17, 2015

Uh oh!

geoffnichols Sep 17, 2015

Choose a reason for hiding this comment

Uh oh!

shrug commented Sep 18, 2015

Uh oh!

geoffnichols Sep 18, 2015

Choose a reason for hiding this comment

Uh oh!

shrug commented Sep 18, 2015

Uh oh!

joshcooper commented Sep 18, 2015

Uh oh!

geoffnichols commented Sep 18, 2015

Uh oh!

ScottGarman commented Sep 18, 2015

Uh oh!

geoffnichols commented Sep 21, 2015

Uh oh!

joshcooper commented Sep 21, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants