openstack
/
puppet-tripleo
Code Issues Proposed changes

nova: deploy basic setup for cells 

it's not required in Ocata, let's configure the basic setup for cells.

note: it also cleanup old code that is not valid anymore.

Change-Id: Iac5b2fbe1b03ec7ad4cb8cab2c7694547be6957d
This commit is contained in:
Emilien Macchi 2017-01-26 14:13:20 -05:00
parent e47f6d7cbe
commit 8bb10297ce
3 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,25 +85,8 @@ class tripleo::profile::base::nova::api (
$tls_keyfile = undef
}
if ($step >= 3 and $sync_db) {
$messaging_hosts_real = any2array($::tripleo::profile::base::nova::messaging_hosts)
# TODO(aschultz): remove sprintf once we properly type the port, needs
# to be a string for the os_transport_url function.
$messaging_port_real = sprintf('%s', $::tripleo::profile::base::nova::messaging_port)
$messaging_use_ssl_real = sprintf('%s', bool2num(str2bool($::tripleo::profile::base::nova::messaging_use_ssl)))
#TODO(emilien): enable it again when it's fixed upstream in nova
# https://bugs.launchpad.net/tripleo/+bug/1649341
# class { '::nova::db::sync_cell_v2':
# transport_url => os_transport_url({
# 'transport' => $::tripleo::profile::base::nova::messaging_driver,
# 'hosts' => $messaging_hosts_real,
# 'port' => $messaging_port_real,
# 'username' => $::tripleo::profile::base::nova::messaging_username,
# 'password' => $::tripleo::profile::base::nova::messaging_password,
# 'ssl' => $messaging_use_ssl_real,
# }),
# }
if $step >= 3 and $sync_db {
include ::nova::cell_v2::simple_setup
}
if $step >= 4 or ($step >= 3 and $sync_db) {

3
releasenotes/notes/nova_cells_setup-2c3e3344d8adcc26.yaml Normal file
View File

@ -0,0 +1,3 @@
---
features:
- Configure the basic cells setup for Nova, now required in Ocata.

7
spec/classes/tripleo_profile_base_nova_api_spec.rb
View File

@ -53,11 +53,8 @@ eos
it {
is_expected.to contain_class('tripleo::profile::base::nova::api')
is_expected.to contain_class('tripleo::profile::base::nova')
#TODO(emilien): enable it again when it's fixed upstream in nova
# https://bugs.launchpad.net/tripleo/+bug/1649341
# is_expected.to contain_class('nova::db::sync_cell_v2').with(
# :transport_url => 'rabbit://nova:foo@localhost:5672/?ssl=0')
# is_expected.to contain_class('nova::keystone::authtoken')
is_expected.to contain_class('nova::cell_v2::simple_setup')
is_expected.to contain_class('nova::keystone::authtoken')
is_expected.to contain_class('nova::api')
is_expected.to contain_class('nova::wsgi::apache_api')
is_expected.to contain_class('nova::network::neutron')