openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Remove unused class for cell v2 setup"

This commit is contained in:
Zuul 2022-08-24 03:12:22 +00:00 committed by Gerrit Code Review
parent d1fcec5815 d7a46e1b39
commit 51d77f99d3
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,10 +72,6 @@ class tripleo::profile::base::nova::api (
include tripleo::profile::base::nova
include tripleo::profile::base::nova::authtoken
if $step >= 3 and $sync_db {
include nova::cell_v2::simple_setup
}
if $step >= 4 or ($step >= 3 and $sync_db) {
class { 'nova::api':
sync_db => $sync_db,
@ -116,14 +112,6 @@ class tripleo::profile::base::nova::api (
include nova::cron::purge_shadow_tables
}
}
# 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 }
}
}
}

3
spec/classes/tripleo_profile_base_nova_api_spec.rb
View File

@ -64,7 +64,6 @@ eos
is_expected.to contain_class('tripleo::profile::base::nova::api')
is_expected.to contain_class('tripleo::profile::base::nova')
is_expected.to contain_class('tripleo::profile::base::nova::authtoken')
is_expected.to contain_class('nova::cell_v2::simple_setup')
is_expected.to contain_class('nova::api').with(
:nova_metadata_wsgi_enabled => true
)
@ -90,7 +89,6 @@ eos
is_expected.to contain_class('tripleo::profile::base::nova::api')
is_expected.to contain_class('tripleo::profile::base::nova')
is_expected.to contain_class('tripleo::profile::base::nova::authtoken')
is_expected.to_not contain_class('nova::cell_v2::simple_setup')
is_expected.to_not contain_class('nova::api')
is_expected.to_not contain_class('nova::cors')
is_expected.to_not contain_class('nova::quota')
@ -114,7 +112,6 @@ eos
is_expected.to contain_class('tripleo::profile::base::nova::api')
is_expected.to contain_class('tripleo::profile::base::nova')
is_expected.to contain_class('tripleo::profile::base::nova::authtoken')
is_expected.to_not contain_class('nova::cell_v2::simple_setup')
is_expected.to contain_class('nova::api').with(
:nova_metadata_wsgi_enabled => true
)