openstack
/
puppet-tripleo
Code Issues Proposed changes

start nova-compute when keystone resources are created 

1. Move keystone resources management at step 4.
2. Move nova-compute startup at step 5.

That way, we make sure nova-compute will start when all Keystone
resources are ready.

Change-Id: I6e153e11b8519254d2a67b9142bf774a25bce69d
Closes-Bug: #1663273
This commit is contained in:
Emilien Macchi 2017-02-09 10:30:54 -05:00
parent 40f12b482d
commit 3b00ffc728
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/profile/base/keystone.pp
View File

@ -168,11 +168,11 @@ class tripleo::profile::base::keystone (
}
if $step >= 5 and $manage_db_purge {
if $step >= 4 and $manage_db_purge {
include ::keystone::cron::token_flush
}
if $step >= 5 and $manage_domain {
if $step >= 4 and $manage_domain {
if hiera('heat_engine_enabled', false) {
# create these seperate and don't use ::heat::keystone::domain since
# that class writes out the configs
@ -193,7 +193,7 @@ class tripleo::profile::base::keystone (
}
}
if $step >= 5 and $manage_endpoint{
if $step >= 4 and $manage_endpoint{
if hiera('aodh_api_enabled', false) {
include ::aodh::keystone::auth
}

3
manifests/profile/base/nova/compute.pp
View File

@ -32,7 +32,7 @@ class tripleo::profile::base::nova::compute (
$cinder_nfs_backend = hiera('cinder_enable_nfs_backend', false),
) {
if $step >= 4 {
if $step >= 5 {
# deploy basic bits for nova
include ::tripleo::profile::base::nova
@ -42,6 +42,7 @@ class tripleo::profile::base::nova::compute (
# before nova-compute.
Service<| title == 'nova-conductor' |> -> Service['nova-compute']
# deploy bits to connect nova compute to neutron
include ::nova::network::neutron

8
spec/classes/tripleo_profile_base_nova_compute_spec.rb
View File

@ -19,7 +19,7 @@ require 'spec_helper'
describe 'tripleo::profile::base::nova::compute' do
shared_examples_for 'tripleo::profile::base::nova::compute' do
context 'with step less than 4' do
context 'with step less than 5' do
let(:params) { { :step => 1, } }
it {
@ -32,7 +32,7 @@ describe 'tripleo::profile::base::nova::compute' do
}
end
context 'with step 4' do
context 'with step 5' do
let(:pre_condition) do
<<-eos
class { '::tripleo::profile::base::nova':
@ -43,7 +43,7 @@ eos
end
context 'default params' do
let(:params) { { :step => 4, } }
let(:params) { { :step => 5, } }
it {
is_expected.to contain_class('tripleo::profile::base::nova::compute')
@ -58,7 +58,7 @@ eos
end
context 'cinder nfs backend' do
let(:params) { { :step => 4, :cinder_nfs_backend => true } }
let(:params) { { :step => 5, :cinder_nfs_backend => true } }
it {
is_expected.to contain_class('tripleo::profile::base::nova::compute')