From 8bb10297ced7a93d93aac0d4e5e0725ab178e557 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 26 Jan 2017 14:13:20 -0500 Subject: 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 --- manifests/profile/base/nova/api.pp | 21 ++------------------- .../notes/nova_cells_setup-2c3e3344d8adcc26.yaml | 3 +++ spec/classes/tripleo_profile_base_nova_api_spec.rb | 7 ++----- 3 files changed, 7 insertions(+), 24 deletions(-) create mode 100644 releasenotes/notes/nova_cells_setup-2c3e3344d8adcc26.yaml diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp index 8ded3ef..83baae2 100644 --- a/manifests/profile/base/nova/api.pp +++ b/manifests/profile/base/nova/api.pp @@ -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) { diff --git a/releasenotes/notes/nova_cells_setup-2c3e3344d8adcc26.yaml b/releasenotes/notes/nova_cells_setup-2c3e3344d8adcc26.yaml new file mode 100644 index 0000000..79439b2 --- /dev/null +++ b/releasenotes/notes/nova_cells_setup-2c3e3344d8adcc26.yaml @@ -0,0 +1,3 @@ +--- +features: + - Configure the basic cells setup for Nova, now required in Ocata. diff --git a/spec/classes/tripleo_profile_base_nova_api_spec.rb b/spec/classes/tripleo_profile_base_nova_api_spec.rb index 4aa7367..f930342 100644 --- a/spec/classes/tripleo_profile_base_nova_api_spec.rb +++ b/spec/classes/tripleo_profile_base_nova_api_spec.rb @@ -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') -- cgit 1.2.3-korg