Closed Bug 792826 Opened 13 years ago Closed 13 years ago

Simplify supervisord puppet manifests

Categories

(Infrastructure & Operations Graveyard :: CIDuty, task)

Product:
Infrastructure & Operations Graveyard
Component:
CIDuty
Platform:
x86_64
Linux
Type:
task
Priority:
Not set
Severity:
normal

Tracking

(Not tracked)

Status:
RESOLVED FIXED

People

(Reporter: rail, Assigned: rail)

Details

(Whiteboard: [puppet])

Attachments

(1 file, 1 obsolete file)

refactored supervisor manifests v2
5.55 KB, patch
dustin
: review+
rail
: checked-in+
Details | Diff | Splinter Review
Sometimes it fails trying to update its config from the temp file which doesn't exists. Supervisord 3 supports glob inclusion of files from a directory.
Attached patch refactored supervisor manifests (obsolete) — — Splinter Review
* mv supervisord.conf.header supervisord.conf * add the following to supervisord.conf: [include] files = /etc/supervisord.conf.d/* * drop supervisord_make_config invocation to generate supervisord.conf * no need to purge old files from /etc/supervisord.conf.d/ because ensure => directory and recurse => true make sure that the directory contains only managed files. * worked smooth in staging
Attachment #663010 - Flags: review?(dustin)
Comment on attachment 663010 [details] [diff] [review] refactored supervisor manifests looks great!
Attachment #663010 - Flags: review?(dustin) → review+
Comment on attachment 663010 [details] [diff] [review] refactored supervisor manifests http://hg.mozilla.org/build/puppet/rev/da624bfd699c
Attachment #663010 - Flags: checked-in+
Comment on attachment 663010 [details] [diff] [review] refactored supervisor manifests http://hg.mozilla.org/build/puppet/rev/ad0aedcd5423 Hmm, something went wrong and /etc/supervisord.conf.d/ is empty now :/ I need to investigate this more, because even with an empty /etc/supervisord.conf.d/ Xvfb was running after full restart of service...
Attachment #663010 - Flags: checked-in+ → checked-in-
It turned out that nothing was wrong, I was looking into a wrong directory :) because we have 2 directories for supervisord: /etc/supervisord.d (from RPM) and a "temporary" /etc/supervisord.conf.d directory used by our scripts to generate the final config. I fixed the patch to use /etc/supervisord.d and remove /etc/supervisord.conf.d Interdiff is very simple https://gist.github.com/3801110 Tested in staging, worked fine.
Attachment #663010 - Attachment is obsolete: true
Attachment #665962 - Flags: review?(dustin)
Comment on attachment 665962 [details] [diff] [review] refactored supervisor manifests v2 Review of attachment 665962 [details] [diff] [review]: ----------------------------------------------------------------- on the basis of the interdiff
Attachment #665962 - Flags: review?(dustin) → review+
Comment on attachment 665962 [details] [diff] [review] refactored supervisor manifests v2 http://hg.mozilla.org/build/puppet/rev/2c3539f9a37d
Attachment #665962 - Flags: checked-in+
Status: NEW → RESOLVED
Closed: 13 years ago
Resolution: --- → FIXED
Product: mozilla.org → Release Engineering
Product: Release Engineering → Infrastructure & Operations
Product: Infrastructure & Operations → Infrastructure & Operations Graveyard
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Creator:
Created:
Updated:
Size: