x/packstack
Code Issues Proposed changes

Revert cells v2 support

Browse Source 
Partial revert of a64f86e3a0
matching puppet-openstack-integration workaround
 https://review.openstack.org/420167

Related-bug: 1656276
Change-Id: Iffc70e22a762f58c3f946e27cd0064f3e33b892d
This commit is contained in:
Alan Pevec
2017-01-14 13:56:29 +01:00
parent 6029be0e30
commit 0ab6d87dae
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packstack/puppet/modules/packstack/manifests/mariadb/services.pp
View File

@@ -100,18 +100,20 @@ class packstack::mariadb::services ()
host => '%', host => '%',
allowed_hosts => '%', allowed_hosts => '%',
charset => 'utf8', charset => 'utf8',
setup_cell0 => true, #TODO(apevec): enable it again when it's fixed upstream in nova
} # https://bugs.launchpad.net/nova/+bug/1656276
class { '::nova::db::sync_cell_v2': setup_cell0 => false,
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')),
})
} }
#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 if hiera('CONFIG_PANKO_INSTALL') == 'y' and