x/packstack
Code Issues Proposed changes

Merge "Remove qpid support"

Browse Source
This commit is contained in:
Jenkins
2016-01-14 03:42:59 +00:00
committed by Gerrit Code Review
parent ab6f0cf01b 6da346a853
commit 5ca0182653
15 changed files with 3 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/packstack.rst
View File

@@ -260,7 +260,7 @@ AMQP Config parameters
----------------------
**CONFIG_AMQP_BACKEND**
Service to be used as the AMQP broker. Allowed values are: qpid, rabbitmq ['qpid', 'rabbitmq']
Service to be used as the AMQP broker. Allowed values are: rabbitmq ['rabbitmq']
**CONFIG_AMQP_HOST**
IP address of the server on which to install the AMQP service.

2
packstack/plugins/amqp_002.py
View File

@@ -38,7 +38,7 @@ def initConfig(controller):
params = [
{"CMD_OPTION": "amqp-backend",
"PROMPT": "Set the AMQP service backend",
"OPTION_LIST": ["qpid", "rabbitmq"],
"OPTION_LIST": ["rabbitmq"],
"VALIDATORS": [validators.validate_options],
"DEFAULT_VALUE": "rabbitmq",
"MASK_INPUT": False,

2
packstack/plugins/puppet_950.py
View File

@@ -145,7 +145,7 @@ def copy_puppet_modules(config, messages):
'heat', 'horizon', 'inifile', 'ironic', 'keystone',
'manila', 'memcached', 'mongodb', 'mysql',
'neutron', 'nova', 'nssdb', 'openstack',
'openstacklib', 'packstack', 'qpid', 'rabbitmq',
'openstacklib', 'packstack', 'rabbitmq',
'redis', 'remote', 'rsync', 'sahara', 'ssh',
'stdlib', 'swift', 'sysctl', 'tempest', 'trove',
'vcsrepo', 'vlan', 'vswitch', 'xinetd', ))

68
packstack/puppet/templates/amqp.pp
View File

@@ -2,12 +2,6 @@ $amqp = hiera('CONFIG_AMQP_BACKEND')
$amqp_enable_ssl = hiera('CONFIG_AMQP_SSL_ENABLED')
case $amqp {
'qpid': {
enable_qpid { 'qpid':
enable_ssl => $amqp_enable_ssl,
enable_auth => hiera('CONFIG_AMQP_ENABLE_AUTH'),
}
}
'rabbitmq': {
enable_rabbitmq { 'rabbitmq': }
}
@@ -77,65 +71,3 @@ define enable_rabbitmq {
}
}
define enable_qpid($enable_ssl = 'n', $enable_auth = 'n') {
case $::operatingsystem {
'Fedora': {
if (versioncmp($::operatingsystemmajrelease, '20') >= 0) or $::operatingsystemrelease == 'Rawhide' {
$config = '/etc/qpid/qpidd.conf'
} else {
$config = '/etc/qpidd.conf'
}
}
'RedHat', 'CentOS', 'Scientific': {
if (versioncmp($::operatingsystemmajrelease, '7') >= 0) {
$config = '/etc/qpid/qpidd.conf'
} else {
$config = '/etc/qpidd.conf'
}
}
default: {
$config = '/etc/qpidd.conf'
}
}
class { '::qpid::server':
config_file => $config,
auth => $enable_auth ? {
'y' => 'yes',
default => 'no',
},
clustered => false,
ssl_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
ssl_cert => '/etc/pki/tls/certs/ssl_amqp.crt',
ssl_key => '/etc/pki/tls/private/ssl_amqp.key',
ssl_database_password => hiera('CONFIG_AMQP_NSS_CERTDB_PW', undef),
}
if $enable_auth == 'y' {
add_qpid_user { 'qpid_user': }
}
}
define add_qpid_user {
$config_amqp_auth_user = hiera('CONFIG_AMQP_AUTH_USER')
qpid_user { $config_amqp_auth_user:
password => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
file => '/var/lib/qpidd/qpidd.sasldb',
realm => 'QPID',
provider => 'saslpasswd2',
require => Class['qpid::server'],
}
file { 'sasldb_file':
ensure => file,
path => '/var/lib/qpidd/qpidd.sasldb',
owner => 'qpidd',
group => 'qpidd',
require => Package['qpid-cpp-server'],
}
}

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

@@ -1,11 +0,0 @@
class { '::ceilometer':
metering_secret => hiera('CONFIG_CEILOMETER_SECRET'),
qpid_hostname => hiera('CONFIG_AMQP_HOST_URL'),
qpid_username => hiera('CONFIG_AMQP_AUTH_USER'),
qpid_password => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
rpc_backend => 'qpid',
verbose => true,
debug => hiera('CONFIG_DEBUG_MODE'),
qpid_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
qpid_protocol => hiera('CONFIG_AMQP_PROTOCOL'),
}

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

@@ -1,14 +0,0 @@
$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 => 'qpid',
qpid_hostname => hiera('CONFIG_AMQP_HOST_URL'),
qpid_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
qpid_protocol => hiera('CONFIG_AMQP_PROTOCOL'),
qpid_username => hiera('CONFIG_AMQP_AUTH_USER'),
qpid_password => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
database_connection => "mysql+pymysql://cinder:${cinder_qpid_cfg_cinder_db_pw}@${cinder_qpid_cfg_mariadb_host}/cinder",
verbose => true,
debug => hiera('CONFIG_DEBUG_MODE'),
}

8
packstack/puppet/templates/glance_ceilometer_qpid.pp
View File

@@ -1,8 +0,0 @@
class { '::glance::notify::qpid':
qpid_password => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
qpid_username => hiera('CONFIG_AMQP_AUTH_USER'),
qpid_hostname => hiera('CONFIG_AMQP_HOST_URL'),
qpid_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
qpid_protocol => hiera('CONFIG_AMQP_PROTOCOL'),
}

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

@@ -1,18 +0,0 @@
$heat_qpid_cfg_heat_db_pw = hiera('CONFIG_HEAT_DB_PW')
$heat_qpid_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
class { '::heat':
keystone_password => hiera('CONFIG_HEAT_KS_PW'),
auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
keystone_ec2_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
rpc_backend => 'qpid',
qpid_hostname => hiera('CONFIG_AMQP_HOST_URL'),
qpid_username => hiera('CONFIG_AMQP_AUTH_USER'),
qpid_password => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
qpid_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
qpid_protocol => hiera('CONFIG_AMQP_PROTOCOL'),
verbose => true,
debug => hiera('CONFIG_DEBUG_MODE'),
database_connection => "mysql+pymysql://heat:${heat_qpid_cfg_heat_db_pw}@${heat_qpid_cfg_mariadb_host}/heat",
}

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

@@ -1,14 +0,0 @@
$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 => 'qpid',
qpid_hostname => hiera('CONFIG_AMQP_HOST_URL'),
qpid_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
qpid_protocol => hiera('CONFIG_AMQP_PROTOCOL'),
qpid_username => hiera('CONFIG_AMQP_AUTH_USER'),
qpid_password => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
database_connection => "mysql+pymysql://ironic:${ironic_qpid_cfg_ironic_db_pw}@${ironic_qpid_cfg_mariadb_host}/ironic",
debug => true,
verbose => true,
}

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

@@ -1,15 +0,0 @@
$db_pw = hiera('CONFIG_MANILA_DB_PW')
$mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
class { '::manila':
rpc_backend => 'qpid',
qpid_hostname => hiera('CONFIG_AMQP_HOST_URL'),
qpid_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
qpid_protocol => hiera('CONFIG_AMQP_PROTOCOL'),
qpid_username => hiera('CONFIG_AMQP_AUTH_USER'),
qpid_password => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
sql_connection => "mysql+pymysql://manila:${db_pw}@${mariadb_host}/manila",
verbose => true,
debug => hiera(CONFIG_DEBUG_MODE),
}

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

@@ -1,20 +0,0 @@
$bind_host = hiera('CONFIG_IP_VERSION') ? {
'ipv6' => '::0',
default => '0.0.0.0',
# TO-DO(mmagr): Add IPv6 support when hostnames are used
}
class { '::neutron':
bind_host => $bind_host,
rpc_backend => 'qpid',
qpid_hostname => hiera('CONFIG_AMQP_HOST_URL'),
qpid_username => hiera('CONFIG_AMQP_AUTH_USER'),
qpid_password => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
qpid_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
qpid_protocol => hiera('CONFIG_AMQP_PROTOCOL'),
core_plugin => hiera('CONFIG_NEUTRON_CORE_PLUGIN'),
allow_overlapping_ips => true,
service_plugins => hiera_array('SERVICE_PLUGINS'),
verbose => true,
debug => hiera('CONFIG_DEBUG_MODE'),
}

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

@@ -1,15 +0,0 @@
class { '::ceilometer':
metering_secret => hiera('CONFIG_CEILOMETER_SECRET'),
qpid_hostname => hiera('CONFIG_AMQP_HOST_URL'),
qpid_username => hiera('CONFIG_AMQP_AUTH_USER'),
qpid_password => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
qpid_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
qpid_protocol => hiera('CONFIG_AMQP_PROTOCOL'),
rpc_backend => 'qpid',
verbose => true,
debug => hiera('CONFIG_DEBUG_MODE'),
# for some strange reason ceilometer needs to be in nova group
require => Package['nova-common'],
}

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

@@ -1,32 +0,0 @@
$private_key = {
'type' => hiera('NOVA_MIGRATION_KEY_TYPE'),
key => hiera('NOVA_MIGRATION_KEY_SECRET'),
}
$public_key = {
'type' => hiera('NOVA_MIGRATION_KEY_TYPE'),
key => hiera('NOVA_MIGRATION_KEY_PUBLIC'),
}
$nova_common_qpid_cfg_storage_host = hiera('CONFIG_STORAGE_HOST_URL')
$nova_common_notification_driver = hiera('CONFIG_CEILOMETER_INSTALL') ? {
'y' => [
'nova.openstack.common.notifier.rpc_notifier',
'ceilometer.compute.nova_notifier'
],
default => undef
}
class { '::nova':
glance_api_servers => "${nova_common_qpid_cfg_storage_host}:9292",
qpid_hostname => hiera('CONFIG_AMQP_HOST_URL'),
qpid_username => hiera('CONFIG_AMQP_AUTH_USER'),
qpid_password => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
rpc_backend => 'qpid',
qpid_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
qpid_protocol => hiera('CONFIG_AMQP_PROTOCOL'),
verbose => true,
debug => hiera('CONFIG_DEBUG_MODE'),
nova_public_key => $public_key,
nova_private_key => $private_key,
notification_driver => $nova_common_notification_driver,
}

23
packstack/puppet/templates/sahara_qpid.pp
View File

@@ -1,23 +0,0 @@
$sahara_cfg_sahara_db_pw = hiera('CONFIG_SAHARA_DB_PW')
$sahara_cfg_sahara_mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
$sahara_cfg_config_neutron_install = hiera('CONFIG_NEUTRON_INSTALL')
class { '::sahara':
database_connection =>
"mysql+pymysql://sahara:${sahara_cfg_sahara_db_pw}@${sahara_cfg_sahara_mariadb_host}/sahara",
verbose => true,
debug => hiera('CONFIG_DEBUG_MODE'),
admin_user => 'sahara',
admin_password => hiera('CONFIG_SAHARA_KS_PW'),
admin_tenant_name => 'services',
auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
use_neutron => ($sahara_cfg_config_neutron_install == 'y'),
host => hiera('CONFIG_SAHARA_HOST'),
rpc_backend => 'qpid',
qpid_hostname => hiera('CONFIG_AMQP_HOST_URL'),
qpid_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
qpid_protocol => hiera('CONFIG_AMQP_PROTOCOL'),
qpid_username => hiera('CONFIG_AMQP_AUTH_USER'),
qpid_password => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
}

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

@@ -1,20 +0,0 @@
$trove_qpid_cfg_trove_db_pw = hiera('CONFIG_TROVE_DB_PW')
$trove_qpid_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
$trove_qpid_cfg_controller_host = hiera('CONFIG_KEYSTONE_HOST_URL')
class { '::trove':
rpc_backend => 'qpid',
qpid_hostname => hiera('CONFIG_AMQP_HOST_URL'),
qpid_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
qpid_protocol => hiera('CONFIG_AMQP_PROTOCOL'),
qpid_username => hiera('CONFIG_AMQP_AUTH_USER'),
qpid_password => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
database_connection => "mysql+pymysql://trove:${trove_qpid_cfg_trove_db_pw}@${trove_qpid_cfg_mariadb_host}/trove",
nova_proxy_admin_user => hiera('CONFIG_TROVE_NOVA_USER'),
nova_proxy_admin_tenant_name => hiera('CONFIG_TROVE_NOVA_TENANT'),
nova_proxy_admin_pass => hiera('CONFIG_TROVE_NOVA_PW'),
nova_compute_url => "http://${trove_qpid_cfg_controller_host}:8774/v2",
cinder_url => "http://${trove_qpid_cfg_controller_host}:8776/v1",
swift_url => "http://${trove_qpid_cfg_controller_host}:8080/v1/AUTH_",
use_neutron => hiera('CONFIG_NEUTRON_INSTALL'),
}