From be101ecbb7052887ba79ec503a99952615e7d4fc Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Tue, 8 Nov 2016 12:49:41 -0700 Subject: [PATCH] Deprecate rabbitmq connection parameters The rabbitmq connection parameters have been deprecated in favor of the transport_url setting. Change-Id: I5f644bf79ce46586fd8d1517969a2a57178e7d3c Related-Bug: #1625198 --- manifests/init.pp | 71 +++++++++++-------- ...n-params-deprecation-ab8842cdfbadc64a.yaml | 6 ++ spec/acceptance/ironic_wsgi_apache_spec.rb | 8 +-- 3 files changed, 50 insertions(+), 35 deletions(-) create mode 100644 releasenotes/notes/rabbit-connection-params-deprecation-ab8842cdfbadc64a.yaml diff --git a/manifests/init.pp b/manifests/init.pp index 6467f182..8503bf51 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -61,30 +61,6 @@ # (optional) what rpc/queuing service to use (string value) # Defaults to $::os_service_default # -# [*rabbit_host*] -# (optional) IP or hostname of the rabbit server. (string value) -# Defaults to $::os_service_default -# -# [*rabbit_hosts*] -# (optional) List of clustered rabbit servers. (string value) -# Defaults to $::os_service_default -# -# [*rabbit_userid*] -# (optional) User used to connect to rabbitmq. (string value) -# Defaults to $::os_service_default -# -# [*rabbit_port*] -# (optional) Port for rabbitmq instance. (port value) -# Defaults to $::os_service_default -# -# [*rabbit_password*] -# (optional) Password used to connect to rabbitmq. (string value) -# Defaults to $::os_service_default -# -# [*rabbit_virtual_host*] -# (optional) The RabbitMQ virtual host. (string value) -# Defaults to $::os_service_default -# # [*rabbit_use_ssl*] # (optional) Connect over SSL for RabbitMQ. (boolean value) # Defaults to $::os_service_default @@ -289,6 +265,30 @@ # initialization. Deprecated and moved to conductor. # Defaults to undef # +# [*rabbit_host*] +# (optional) IP or hostname of the rabbit server. (string value) +# Defaults to $::os_service_default +# +# [*rabbit_hosts*] +# (optional) List of clustered rabbit servers. (string value) +# Defaults to $::os_service_default +# +# [*rabbit_userid*] +# (optional) User used to connect to rabbitmq. (string value) +# Defaults to $::os_service_default +# +# [*rabbit_port*] +# (optional) Port for rabbitmq instance. (port value) +# Defaults to $::os_service_default +# +# [*rabbit_password*] +# (optional) Password used to connect to rabbitmq. (string value) +# Defaults to $::os_service_default +# +# [*rabbit_virtual_host*] +# (optional) The RabbitMQ virtual host. (string value) +# Defaults to $::os_service_default +# class ironic ( $enabled = true, $package_ensure = 'present', @@ -303,12 +303,6 @@ class ironic ( $rpc_response_timeout = $::os_service_default, $default_transport_url = $::os_service_default, $rpc_backend = $::os_service_default, - $rabbit_host = $::os_service_default, - $rabbit_hosts = $::os_service_default, - $rabbit_password = $::os_service_default, - $rabbit_port = $::os_service_default, - $rabbit_userid = $::os_service_default, - $rabbit_virtual_host = $::os_service_default, $rabbit_use_ssl = $::os_service_default, $rabbit_heartbeat_timeout_threshold = $::os_service_default, $rabbit_heartbeat_rate = $::os_service_default, @@ -352,6 +346,12 @@ class ironic ( # DEPRECATED PARAMETERS $rabbit_user = undef, $enabled_drivers = undef, + $rabbit_host = $::os_service_default, + $rabbit_hosts = $::os_service_default, + $rabbit_password = $::os_service_default, + $rabbit_port = $::os_service_default, + $rabbit_userid = $::os_service_default, + $rabbit_virtual_host = $::os_service_default, ) { include ::ironic::deps @@ -366,6 +366,17 @@ class ironic ( $rabbit_user_real = $rabbit_userid } + if !is_service_default($rabbit_host) or + !is_service_default($rabbit_hosts) or + !is_service_default($rabbit_password) or + !is_service_default($rabbit_port) or + !is_service_default($rabbit_userid) or + !is_service_default($rabbit_virtual_host) { + warning("ironic::rabbit_host, ironic::rabbit_hosts, ironic::rabbit_password, \ +ironic::rabbit_port, ironic::rabbit_userid and ironic::rabbit_virtual_host are \ +deprecated. Please use ironic::default_transport_url instead.") + } + package { 'ironic-common': ensure => $package_ensure, name => $::ironic::params::common_package_name, diff --git a/releasenotes/notes/rabbit-connection-params-deprecation-ab8842cdfbadc64a.yaml b/releasenotes/notes/rabbit-connection-params-deprecation-ab8842cdfbadc64a.yaml new file mode 100644 index 00000000..0f9f89d3 --- /dev/null +++ b/releasenotes/notes/rabbit-connection-params-deprecation-ab8842cdfbadc64a.yaml @@ -0,0 +1,6 @@ +--- +deprecations: + - ironic::rabbit_host, ironic::rabbit_hosts, ironic::rabbit_password, + ironic::rabbit_port, ironic::rabbit_userid and + ironic::rabbit_virtual_host are deprecated. + ironic::default_transport_url should be used instead. diff --git a/spec/acceptance/ironic_wsgi_apache_spec.rb b/spec/acceptance/ironic_wsgi_apache_spec.rb index 732e11c3..e1142caf 100644 --- a/spec/acceptance/ironic_wsgi_apache_spec.rb +++ b/spec/acceptance/ironic_wsgi_apache_spec.rb @@ -32,11 +32,9 @@ describe 'basic ironic' do # Ironic resources class { '::ironic': - rabbit_userid => 'ironic', - rabbit_password => 'an_even_bigger_secret', - rabbit_host => '127.0.0.1', - database_connection => 'mysql+pymysql://ironic:a_big_secret@127.0.0.1/ironic?charset=utf8', - debug => true, + default_transport_url => 'rabbit://ironic:an_even_bigger_secret@127.0.0.1:5672/', + database_connection => 'mysql+pymysql://ironic:a_big_secret@127.0.0.1/ironic?charset=utf8', + debug => true, } class { '::ironic::db::mysql': password => 'a_big_secret',