x
/
packstack
Code Issues Proposed changes

Merge "Revert cells v2 support"

This commit is contained in:
Jenkins 2017-01-14 19:40:53 +00:00 committed by Gerrit Code Review
parent b2a00a915a 0ab6d87dae
commit fdf79a6a2c
1 changed files with 13 additions and 11 deletions
Show Stats 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 => '%',
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