openstack/puppet-tripleo
Code Issues Proposed changes

Merge "Run nova-cell_v2-discover_hosts at step 5"

Browse Source
This commit is contained in:
Jenkins 2017-02-10 14:40:59 +00:00 committed by Gerrit Code Review
commit e12dbec87f
6 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,7 +172,7 @@ class tripleo::profile::base::keystone (
include ::keystone::cron::token_flush
}
if $step >= 4 and $manage_domain {
if $step >= 3 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 >= 4 and $manage_endpoint{
if $step >= 3 and $manage_endpoint{
if hiera('aodh_api_enabled', false) {
include ::aodh::keystone::auth
}

2
manifests/profile/base/neutron/ovs.pp
View File

@ -28,7 +28,7 @@ class tripleo::profile::base::neutron::ovs(
) {
include ::tripleo::profile::base::neutron
if $step >= 4 {
if $step >= 5 {
include ::neutron::agents::ml2::ovs
# Optional since manage_service may be false and neutron server may not be colocated.

7
manifests/profile/base/nova/api.pp
View File

@ -119,6 +119,13 @@ class tripleo::profile::base::nova::api (
if hiera('nova_enable_db_purge', true) {
include ::nova::cron::archive_deleted_rows
}
# At step 5, we consider all nova-compute services started and registred to nova-conductor
# So we want to update Nova Cells database to be aware of these hosts by executing the
# nova-cell_v2-discover_hosts command again.
# Doing it on a single nova-api node to avoid race condition.
if $sync_db {
Exec<| title == 'nova-cell_v2-discover_hosts' |> { refreshonly => false }
}
}
}

2
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 >= 5 {
if $step >= 4 {
# deploy basic bits for nova
include ::tripleo::profile::base::nova

2
manifests/profile/base/nova/placement.pp
View File

@ -85,7 +85,7 @@ class tripleo::profile::base::nova::placement (
$tls_keyfile = undef
}
if $step >= 4 {
if $step >= 3 {
class { '::nova::wsgi::apache_placement':
ssl_cert => $tls_certfile,
ssl_key => $tls_keyfile,

4
spec/classes/tripleo_profile_base_nova_compute_spec.rb
View File

@ -43,7 +43,7 @@ eos
end
context 'default params' do
let(:params) { { :step => 5, } }
let(:params) { { :step => 4, } }
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 => 5, :cinder_nfs_backend => true } }
let(:params) { { :step => 4, :cinder_nfs_backend => true } }
it {
is_expected.to contain_class('tripleo::profile::base::nova::compute')