openstack/fuel-library
Code Issues Proposed changes

Inhibit start of supervisord for nailgun

Browse Source 
Starting supervisord starts nailgun app too early
before it is ready to serve requests. It will be
started later in the docker container in the
foreground. This prevents a race condition where
DB upgrade takes place and nailgun is stopped.

Change-Id: Icd27758f00e8f472041eb83019cb89dcb030afd1
Closes-Bug: #1453400
This commit is contained in:
Matthew Mosesohn 2015-05-12 14:33:58 +03:00
parent 156fb11bbf
commit 682eed618f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/puppet/nailgun/examples/nailgun-only.pp
View File

@ -141,6 +141,7 @@ class { "nailgun::client":
keystone_pass => $::fuel_settings['FUEL_ACCESS']['password'], keystone_pass => $::fuel_settings['FUEL_ACCESS']['password'],
} }
class { "nailgun::supervisor": class { "nailgun::supervisor":
service_enabled => false,
nailgun_env => $env_path, nailgun_env => $env_path,
ostf_env => $env_path, ostf_env => $env_path,
conf_file => "nailgun/supervisord.conf.nailgun.erb", conf_file => "nailgun/supervisord.conf.nailgun.erb",

5
deployment/puppet/nailgun/manifests/supervisor.pp
View File

@ -1,4 +1,5 @@
class nailgun::supervisor( class nailgun::supervisor(
$service_enabled = true,
$nailgun_env, $nailgun_env,
$ostf_env, $ostf_env,
$conf_file = "nailgun/supervisord.conf.erb", $conf_file = "nailgun/supervisord.conf.erb",
@ -33,8 +34,8 @@ class nailgun::supervisor(
} }
service { "supervisord": service { "supervisord":
ensure => "running", ensure => $service_enabled,
enable => true, enable => $service_enabled,
require => [ require => [
Package["supervisor"], Package["supervisor"],
], ],