aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2017-02-09 10:30:54 -0500
committerEmilien Macchi <emilien@redhat.com>2017-02-09 10:30:54 -0500
commit3b00ffc728b47e132b3ed8bc460f8697ddb32047 (patch)
tree55501dca73c4af48deca4f70b36678b26bf91a97
parent40f12b482d0b514ee05c898bc04c0ca0628c8692 (diff)
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
-rw-r--r--manifests/profile/base/keystone.pp6
-rw-r--r--manifests/profile/base/nova/compute.pp3
-rw-r--r--spec/classes/tripleo_profile_base_nova_compute_spec.rb8
3 files changed, 9 insertions, 8 deletions
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index 72049e3..7e70f49 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -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
}
diff --git a/manifests/profile/base/nova/compute.pp b/manifests/profile/base/nova/compute.pp
index 076996a..ec5481a 100644
--- a/manifests/profile/base/nova/compute.pp
+++ b/manifests/profile/base/nova/compute.pp
@@ -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
diff --git a/spec/classes/tripleo_profile_base_nova_compute_spec.rb b/spec/classes/tripleo_profile_base_nova_compute_spec.rb
index a0b2387..d9433be 100644
--- a/spec/classes/tripleo_profile_base_nova_compute_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_compute_spec.rb
@@ -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')