openstack/instack-undercloud
Code Issues Proposed changes

Make sure we start nova-compute after ironic-conductor.

Browse Source 
We need to ensure that ironic-conductor starts before nova-compute.
This is to workaround an issue where nova-compute tries and fails to
call plug_vifs, this in turn report a vm_state error which, in this
case is a false positive.  See lp#1777608 for more.

We ensure ordering by forcing puppet to restart nova-compute after
ironic-conductor in the case of undercloud upgrade/update.

Change-Id: Ifbada53f088258a397777a6fa18dd7c1b37c09d3
Closes-Bug: #1777475
(cherry picked from commit 801fb3ced6)
This commit is contained in:
Sofer Athlan-Guyot
2018-06-18 17:07:13 +02:00
committed by Carlos Camacho
parent 4816d65f08
commit cd986d3ea2
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
elements/puppet-stack-config/puppet-stack-config.pp
View File

@@ -555,6 +555,14 @@ Keystone_endpoint<||> -> Service['ironic-inspector']
Keystone_endpoint <||> -> Service['nova-compute']
Keystone_service <||> -> Service['nova-compute']
# This is a workaround for a race between nova-compute and ironic
# conductor. When https://bugs.launchpad.net/tripleo/+bug/1777608 is
# fixed this can be removed. Currently we wait 1 minutes for the
# ironic conductor service to be ready. As puppet can order thing its
# own way and be slow (especially in CI env) we can have services
# started at more than one minute appart, hence the need for it.
Service[$::ironic::params::conductor_service] -> Service[$::nova::params::compute_service_name]
if str2bool(hiera('enable_tempest', true)) {
# tempest
package{'openstack-tempest': }