From 8168496c9ef0c4428e2ea21d226e594721b71764 Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Fri, 27 Jan 2017 14:05:19 +0100 Subject: [PATCH] Add nova cell v2 setup Cells are required. This patch adds setup of the default cell. Change-Id: I0bb692997c8f438a9c6172f53a8c553c0b9bbbfe --- .../modules/packstack/manifests/mariadb/services.pp | 13 ------------- .../puppet/modules/packstack/manifests/nova/api.pp | 2 ++ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/packstack/puppet/modules/packstack/manifests/mariadb/services.pp b/packstack/puppet/modules/packstack/manifests/mariadb/services.pp index aef41f2cd..249b83329 100755 --- a/packstack/puppet/modules/packstack/manifests/mariadb/services.pp +++ b/packstack/puppet/modules/packstack/manifests/mariadb/services.pp @@ -100,20 +100,7 @@ class packstack::mariadb::services () host => '%', allowed_hosts => '%', charset => 'utf8', - #TODO(apevec): enable it again when it's fixed upstream in nova - # https://bugs.launchpad.net/nova/+bug/1656276 - setup_cell0 => false, } - #class { '::nova::db::sync_cell_v2': - # transport_url => os_transport_url({ - # 'transport' => 'rabbit', - # 'hosts' => [hiera('CONFIG_AMQP_HOST_URL')], - # 'port' => hiera('CONFIG_AMQP_CLIENTS_PORT'), - # 'username' => hiera('CONFIG_AMQP_AUTH_USER'), - # 'password' => hiera('CONFIG_AMQP_AUTH_PASSWORD'), - # 'ssl' => sprintf('%s', hiera('CONFIG_AMQP_SSL_ENABLED')), - # }) - #} } if hiera('CONFIG_PANKO_INSTALL') == 'y' and diff --git a/packstack/puppet/modules/packstack/manifests/nova/api.pp b/packstack/puppet/modules/packstack/manifests/nova/api.pp index 0a143a452..402b541b3 100644 --- a/packstack/puppet/modules/packstack/manifests/nova/api.pp +++ b/packstack/puppet/modules/packstack/manifests/nova/api.pp @@ -52,6 +52,8 @@ class packstack::nova::api () } } + include ::nova::cell_v2::simple_setup + $manage_flavors = str2bool(hiera('CONFIG_NOVA_MANAGE_FLAVORS')) if $manage_flavors { Class['::nova::api'] -> Nova_flavor<||>