Revert cells v2 support
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:
parent
6029be0e30
commit
0ab6d87dae
|
@ -100,18 +100,20 @@ class packstack::mariadb::services ()
|
|||
host => '%',
|
||||
allowed_hosts => '%',
|
||||
charset => 'utf8',
|
||||
setup_cell0 => true,
|
||||
}
|
||||
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')),
|
||||
})
|
||||
#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
|
||||
|
|
Loading…
Reference in New Issue