Totally drop Qpid support
Qpid was removed in Mitaka from Oslo Messaging, so now we can drop it in manifests. Change-Id: I42ac5f2bdc1cc55212ba713e63ffce4edfa1b7a0
This commit is contained in:
Denis Egorenko
parent
d6fd9c8ce7
commit
48815a3bb2
|
|
@ -52,7 +52,6 @@
|
|||
# [*rpc_backend*]
|
||||
# (optional) The rpc backend implementation to use, can be:
|
||||
# rabbit (for rabbitmq)
|
||||
# qpid (for qpid)
|
||||
# zmq (for zeromq)
|
||||
# Defaults to 'rabbit'
|
||||
#
|
||||
|
|
@ -309,38 +308,6 @@
|
|||
#
|
||||
# DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*qpid_hostname*]
|
||||
# (optional) Location of qpid server
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*qpid_port*]
|
||||
# (optional) Port for qpid server
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*qpid_username*]
|
||||
# (optional) Username to use when connecting to qpid
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*qpid_password*]
|
||||
# (optional) Password to use when connecting to qpid
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*qpid_heartbeat*]
|
||||
# (optional) Seconds between connection keepalive heartbeats
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*qpid_protocol*]
|
||||
# (optional) Transport to use, either 'tcp' or 'ssl''
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*qpid_sasl_mechanisms*]
|
||||
# (optional) Enable one or more SASL mechanisms
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*qpid_tcp_nodelay*]
|
||||
# (optional) Disable Nagle algorithm
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*install_utilities*]
|
||||
# (optional) Install nova utilities (Extra packages used by nova tools)
|
||||
# Defaults to undef
|
||||
|
|
@ -420,14 +387,6 @@ class nova(
|
|||
$upgrade_level_scheduler = undef,
|
||||
$use_ipv6 = $::os_service_default,
|
||||
# DEPRECATED PARAMETERS
|
||||
$qpid_hostname = undef,
|
||||
$qpid_port = undef,
|
||||
$qpid_username = undef,
|
||||
$qpid_password = undef,
|
||||
$qpid_sasl_mechanisms = undef,
|
||||
$qpid_heartbeat = undef,
|
||||
$qpid_protocol = undef,
|
||||
$qpid_tcp_nodelay = undef,
|
||||
$install_utilities = undef,
|
||||
$verbose = undef,
|
||||
) inherits nova::params {
|
||||
|
|
@ -563,12 +522,6 @@ class nova(
|
|||
nova_config { 'DEFAULT/rpc_backend': value => $rpc_backend }
|
||||
}
|
||||
|
||||
# we keep "nova.openstack.common.rpc.impl_qpid" for backward compatibility
|
||||
# but since Icehouse, "qpid" is enough.
|
||||
if $rpc_backend == 'nova.openstack.common.rpc.impl_qpid' or $rpc_backend == 'qpid' {
|
||||
warning('Qpid driver is removed from Oslo.messaging in the Mitaka release')
|
||||
}
|
||||
|
||||
# SSL Options
|
||||
if $use_ssl {
|
||||
nova_config {
|
||||
|
|
|
|||
|
|
@ -57,8 +57,7 @@
|
|||
# Defaults to $::os_service_default
|
||||
# Example:
|
||||
# { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
|
||||
# 'qpid' => 'WARN', 'sqlalchemy' => 'WARN', 'suds' => 'INFO',
|
||||
# 'iso8601' => 'WARN',
|
||||
# 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN',
|
||||
# 'requests.packages.urllib3.connectionpool' => 'WARN' }
|
||||
#
|
||||
# [*publish_errors*]
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
# == Class: nova::qpid
|
||||
#
|
||||
# Deprecated class for installing qpid server for nova
|
||||
#
|
||||
# === Parameters:
|
||||
#
|
||||
# [*enabled*]
|
||||
# (optional) Whether to enable the service
|
||||
# Defaults to true
|
||||
#
|
||||
# [*user*]
|
||||
# (optional) The user to create in qpid
|
||||
# Defaults to 'guest'
|
||||
#
|
||||
# [*password*]
|
||||
# (optional) The password to create for the user
|
||||
# Defaults to 'guest'
|
||||
#
|
||||
# [*file*]
|
||||
# (optional) Sasl file for the user
|
||||
# Defaults to '/var/lib/qpidd/qpidd.sasldb'
|
||||
#
|
||||
# [*realm*]
|
||||
# (optional) Realm for the user
|
||||
# Defaults to 'OPENSTACK'
|
||||
#
|
||||
class nova::qpid(
|
||||
$enabled = undef,
|
||||
$user = undef,
|
||||
$password = undef,
|
||||
$file = undef,
|
||||
$realm = undef
|
||||
) {
|
||||
|
||||
warning('Qpid driver is removed from Oslo.messaging in the Mitaka release')
|
||||
}
|
||||
|
|
@ -32,7 +32,6 @@
|
|||
"description": "Installs and configures OpenStack Nova (Compute).",
|
||||
"dependencies": [
|
||||
{ "name": "puppetlabs/apache", "version_requirement": ">=1.0.0 <2.0.0" },
|
||||
{ "name": "dprince/qpid", "version_requirement": ">=1.0.0 <2.0.0" },
|
||||
{ "name": "duritong/sysctl", "version_requirement": ">=0.0.1 <1.0.0" },
|
||||
{ "name": "openstack/cinder", "version_requirement": ">=8.0.0 <9.0.0" },
|
||||
{ "name": "openstack/glance", "version_requirement": ">=8.0.0 <9.0.0" },
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
---
|
||||
other:
|
||||
- Drop all Qpid support, it was removed from Oslo in Mitaka.
|
||||
|
|
@ -17,8 +17,7 @@ describe 'nova::logging' do
|
|||
:publish_errors => true,
|
||||
:default_log_levels => {
|
||||
'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
|
||||
'qpid' => 'WARN', 'sqlalchemy' => 'WARN', 'suds' => 'INFO',
|
||||
'iso8601' => 'WARN',
|
||||
'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN',
|
||||
'requests.packages.urllib3.connectionpool' => 'WARN' },
|
||||
:fatal_deprecations => true,
|
||||
:instance_format => '[instance: %(uuid)s] ',
|
||||
|
|
@ -93,7 +92,7 @@ describe 'nova::logging' do
|
|||
true)
|
||||
|
||||
is_expected.to contain_nova_config('DEFAULT/default_log_levels').with_value(
|
||||
'amqp=WARN,amqplib=WARN,boto=WARN,iso8601=WARN,qpid=WARN,requests.packages.urllib3.connectionpool=WARN,sqlalchemy=WARN,suds=INFO')
|
||||
'amqp=WARN,amqplib=WARN,boto=WARN,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,sqlalchemy=WARN,suds=INFO')
|
||||
|
||||
is_expected.to contain_nova_config('DEFAULT/fatal_deprecations').with_value(
|
||||
true)
|
||||
|
|
|
|||
Loading…
Reference in New Issue