summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2017-01-14 10:21:19 -0500
committerEmilien Macchi <emilien@redhat.com>2017-01-14 17:57:14 -0500
commit0e7a38a3d930ae717da624efea99ae57ff7025da (patch)
tree43b2756b755db603d3ea9250bf2e14a6987952e6
parent5acb133b7f1ec727d544362a4901f7abd05550a9 (diff)
nova: disable ::nova::db::sync_cell_v2
This feature is broken for us now and there is work in progress in Nova to improve nova cell deployment. Until it's fixed upstream, we need to disable cells deployment for now, so we can promote our CI. Change-Id: I379ba9e94a92ed225a03a67fc975b542447a9c8b Related-Bug: #1649341
-rw-r--r--manifests/profile/base/nova/api.pp22
-rw-r--r--spec/classes/tripleo_profile_base_nova_api_spec.rb8
2 files changed, 17 insertions, 13 deletions
diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp
index b4e3d74..8ded3ef 100644
--- a/manifests/profile/base/nova/api.pp
+++ b/manifests/profile/base/nova/api.pp
@@ -92,16 +92,18 @@ class tripleo::profile::base::nova::api (
$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)))
- 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,
- }),
- }
+ #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 >= 4 or ($step >= 3 and $sync_db) {
diff --git a/spec/classes/tripleo_profile_base_nova_api_spec.rb b/spec/classes/tripleo_profile_base_nova_api_spec.rb
index 0d2564d..4aa7367 100644
--- a/spec/classes/tripleo_profile_base_nova_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_api_spec.rb
@@ -53,9 +53,11 @@ eos
it {
is_expected.to contain_class('tripleo::profile::base::nova::api')
is_expected.to contain_class('tripleo::profile::base::nova')
- 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')
+ #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::api')
is_expected.to contain_class('nova::wsgi::apache_api')
is_expected.to contain_class('nova::network::neutron')