x/packstack
Code Issues Proposed changes

Use short names in rpc_backend

Browse Source 
The backwards compatibility for oslo-incubator imports does not function
anymore. We have to switch to short names of rpc backends.

Change-Id: I7b489a516032bae72e4d51241c1e197eee508bf4
This commit is contained in:
Lukas Bezdicka
2015-10-09 14:51:59 +02:00
parent cbbf46e6af
commit 2d9c274846
12 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packstack/puppet/templates/ceilometer_qpid.pp
View File

@@ -3,7 +3,7 @@ class { '::ceilometer':
qpid_hostname => hiera('CONFIG_AMQP_HOST_URL'),
qpid_username => hiera('CONFIG_AMQP_AUTH_USER'),
qpid_password => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
rpc_backend => 'ceilometer.openstack.common.rpc.impl_qpid',
rpc_backend => 'qpid',
verbose => true,
debug => hiera('CONFIG_DEBUG_MODE'),
qpid_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),

2
packstack/puppet/templates/cinder_qpid.pp
View File

@@ -2,7 +2,7 @@ $cinder_qpid_cfg_cinder_db_pw = hiera('CONFIG_CINDER_DB_PW')
$cinder_qpid_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
class { '::cinder':
rpc_backend => 'cinder.openstack.common.rpc.impl_qpid',
rpc_backend => 'qpid',
qpid_hostname => hiera('CONFIG_AMQP_HOST_URL'),
qpid_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
qpid_protocol => hiera('CONFIG_AMQP_PROTOCOL'),

2
packstack/puppet/templates/heat_qpid.pp
View File

@@ -6,7 +6,7 @@ class { '::heat':
auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
keystone_ec2_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
rpc_backend => 'heat.openstack.common.rpc.impl_qpid',
rpc_backend => 'qpid',
qpid_hostname => hiera('CONFIG_AMQP_HOST_URL'),
qpid_username => hiera('CONFIG_AMQP_AUTH_USER'),
qpid_password => hiera('CONFIG_AMQP_AUTH_PASSWORD'),

2
packstack/puppet/templates/heat_rabbitmq.pp
View File

@@ -20,7 +20,7 @@ class { '::heat':
auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
keystone_ec2_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
rpc_backend => 'heat.openstack.common.rpc.impl_kombu',
rpc_backend => 'rabbit',
rabbit_host => hiera('CONFIG_AMQP_HOST_URL'),
rabbit_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),

2
packstack/puppet/templates/ironic_qpid.pp
View File

@@ -2,7 +2,7 @@ $ironic_qpid_cfg_ironic_db_pw = hiera('CONFIG_IRONIC_DB_PW')
$ironic_qpid_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
class { '::ironic':
rpc_backend => 'ironic.openstack.common.rpc.impl_qpid',
rpc_backend => 'qpid',
qpid_hostname => hiera('CONFIG_AMQP_HOST_URL'),
qpid_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
qpid_protocol => hiera('CONFIG_AMQP_PROTOCOL'),

2
packstack/puppet/templates/ironic_rabbitmq.pp
View File

@@ -16,7 +16,7 @@ if $kombu_ssl_keyfile {
}
class { '::ironic':
rpc_backend => 'ironic.openstack.common.rpc.impl_kombu',
rpc_backend => 'rabbit',
rabbit_host => hiera('CONFIG_AMQP_HOST_URL'),
rabbit_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),

2
packstack/puppet/templates/manila_qpid.pp
View File

@@ -3,7 +3,7 @@ $db_pw = hiera('CONFIG_MANILA_DB_PW')
$mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
class { '::manila':
rpc_backend => 'manila.openstack.common.rpc.impl_qpid',
rpc_backend => 'qpid',
qpid_hostname => hiera('CONFIG_AMQP_HOST_URL'),
qpid_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
qpid_protocol => hiera('CONFIG_AMQP_PROTOCOL'),

2
packstack/puppet/templates/neutron_qpid.pp
View File

@@ -6,7 +6,7 @@ $bind_host = hiera('CONFIG_IP_VERSION') ? {
class { '::neutron':
bind_host => $bind_host,
rpc_backend => 'neutron.openstack.common.rpc.impl_qpid',
rpc_backend => 'qpid',
qpid_hostname => hiera('CONFIG_AMQP_HOST_URL'),
qpid_username => hiera('CONFIG_AMQP_AUTH_USER'),
qpid_password => hiera('CONFIG_AMQP_AUTH_PASSWORD'),

2
packstack/puppet/templates/nova_ceilometer_qpid.pp
View File

@@ -6,7 +6,7 @@ class { '::ceilometer':
qpid_password => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
qpid_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
qpid_protocol => hiera('CONFIG_AMQP_PROTOCOL'),
rpc_backend => 'ceilometer.openstack.common.rpc.impl_qpid',
rpc_backend => 'qpid',
verbose => true,
debug => hiera('CONFIG_DEBUG_MODE'),
# for some strange reason ceilometer needs to be in nova group

2
packstack/puppet/templates/nova_common_qpid.pp
View File

@@ -14,7 +14,7 @@ class { '::nova':
qpid_hostname => hiera('CONFIG_AMQP_HOST_URL'),
qpid_username => hiera('CONFIG_AMQP_AUTH_USER'),
qpid_password => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
rpc_backend => 'nova.openstack.common.rpc.impl_qpid',
rpc_backend => 'qpid',
qpid_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
qpid_protocol => hiera('CONFIG_AMQP_PROTOCOL'),
verbose => true,

2
packstack/puppet/templates/trove_qpid.pp
View File

@@ -3,7 +3,7 @@ $trove_qpid_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
$trove_qpid_cfg_controller_host = hiera('CONFIG_KEYSTONE_HOST_URL')
class { '::trove':
rpc_backend => 'trove.openstack.common.rpc.impl_qpid',
rpc_backend => 'qpid',
qpid_hostname => hiera('CONFIG_AMQP_HOST_URL'),
qpid_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
qpid_protocol => hiera('CONFIG_AMQP_PROTOCOL'),

2
packstack/puppet/templates/trove_rabbitmq.pp
View File

@@ -18,7 +18,7 @@ if $kombu_ssl_keyfile {
class { '::trove':
rpc_backend => 'trove.openstack.common.rpc.impl_kombu',
rpc_backend => 'rabbit',
rabbit_host => hiera('CONFIG_AMQP_HOST_URL'),
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
rabbit_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),