diff --git a/manifests/init.pp b/manifests/init.pp index f8725f51d..c371854c7 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -212,66 +212,6 @@ # (string value) # Defaults to $facts['os_service_default'] # -# [*amqp_server_request_prefix*] -# (Optional) Address prefix used when sending to a specific server -# Defaults to $facts['os_service_default']. -# -# [*amqp_broadcast_prefix*] -# (Optional) address prefix used when broadcasting to all servers -# Defaults to $facts['os_service_default']. -# -# [*amqp_group_request_prefix*] -# (Optional) address prefix when sending to any server in group -# Defaults to $facts['os_service_default']. -# -# [*amqp_container_name*] -# (Optional) Name for the AMQP container -# Defaults to $facts['os_service_default']. -# -# [*amqp_idle_timeout*] -# (Optional) Timeout for inactive connections -# Defaults to $facts['os_service_default']. -# -# [*amqp_trace*] -# (Optional) Debug: dump AMQP frames to stdout -# Defaults to $facts['os_service_default']. -# -# [*amqp_ssl_ca_file*] -# (Optional) CA certificate PEM file to verify server certificate -# Defaults to $facts['os_service_default']. -# -# [*amqp_ssl_cert_file*] -# (Optional) Identifying certificate PEM file to present to clients -# Defaults to $facts['os_service_default']. -# -# [*amqp_ssl_key_file*] -# (Optional) Private key PEM file used to sign cert_file certificate -# Defaults to $facts['os_service_default']. -# -# [*amqp_ssl_key_password*] -# (Optional) Password for decrypting ssl_key_file (if encrypted) -# Defaults to $facts['os_service_default']. -# -# [*amqp_sasl_mechanisms*] -# (Optional) Space separated list of acceptable SASL mechanisms -# Defaults to $facts['os_service_default']. -# -# [*amqp_sasl_config_dir*] -# (Optional) Path to directory that contains the SASL configuration -# Defaults to $facts['os_service_default']. -# -# [*amqp_sasl_config_name*] -# (Optional) Name of configuration file (without .conf suffix) -# Defaults to $facts['os_service_default']. -# -# [*amqp_username*] -# (Optional) User name for message broker authentication -# Defaults to $facts['os_service_default']. -# -# [*amqp_password*] -# (Optional) Password for message broker authentication -# Defaults to $facts['os_service_default']. -# # [*use_ssl*] # (optional) Enable SSL on the API server # Defaults to $facts['os_service_default'] @@ -370,21 +310,6 @@ class neutron ( $kombu_missing_consumer_retry_timeout = $facts['os_service_default'], $kombu_failover_strategy = $facts['os_service_default'], $kombu_compression = $facts['os_service_default'], - $amqp_server_request_prefix = $facts['os_service_default'], - $amqp_broadcast_prefix = $facts['os_service_default'], - $amqp_group_request_prefix = $facts['os_service_default'], - $amqp_container_name = $facts['os_service_default'], - $amqp_idle_timeout = $facts['os_service_default'], - $amqp_trace = $facts['os_service_default'], - $amqp_ssl_ca_file = $facts['os_service_default'], - $amqp_ssl_cert_file = $facts['os_service_default'], - $amqp_ssl_key_file = $facts['os_service_default'], - $amqp_ssl_key_password = $facts['os_service_default'], - $amqp_sasl_mechanisms = $facts['os_service_default'], - $amqp_sasl_config_dir = $facts['os_service_default'], - $amqp_sasl_config_name = $facts['os_service_default'], - $amqp_username = $facts['os_service_default'], - $amqp_password = $facts['os_service_default'], $use_ssl = $facts['os_service_default'], $cert_file = $facts['os_service_default'], $key_file = $facts['os_service_default'], @@ -491,24 +416,6 @@ class neutron ( rabbit_quorum_max_memory_bytes => $rabbit_quorum_max_memory_bytes, } - oslo::messaging::amqp { 'neutron_config': - server_request_prefix => $amqp_server_request_prefix, - broadcast_prefix => $amqp_broadcast_prefix, - group_request_prefix => $amqp_group_request_prefix, - container_name => $amqp_container_name, - idle_timeout => $amqp_idle_timeout, - trace => $amqp_trace, - ssl_ca_file => $amqp_ssl_ca_file, - ssl_cert_file => $amqp_ssl_cert_file, - ssl_key_file => $amqp_ssl_key_file, - ssl_key_password => $amqp_ssl_key_password, - sasl_mechanisms => $amqp_sasl_mechanisms, - sasl_config_dir => $amqp_sasl_config_dir, - sasl_config_name => $amqp_sasl_config_name, - username => $amqp_username, - password => $amqp_password, - } - # SSL Options neutron_config { 'DEFAULT/use_ssl': value => $use_ssl; diff --git a/releasenotes/notes/remove-amqp1-f21537661fe866f2.yaml b/releasenotes/notes/remove-amqp1-f21537661fe866f2.yaml new file mode 100644 index 000000000..69b968c27 --- /dev/null +++ b/releasenotes/notes/remove-amqp1-f21537661fe866f2.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Support for amqp1 messaging driver has been removed. diff --git a/spec/classes/neutron_init_spec.rb b/spec/classes/neutron_init_spec.rb index d9dd49ce3..1b7c7be2c 100644 --- a/spec/classes/neutron_init_spec.rb +++ b/spec/classes/neutron_init_spec.rb @@ -48,10 +48,6 @@ describe 'neutron' do it_behaves_like 'with max_allowed_address_pair defined' it_behaves_like 'when disabling vlan_transparent' it_behaves_like 'when enabling vlan_transparent' - - context 'with amqp messaging' do - it_behaves_like 'amqp support' - end end shared_examples 'a neutron base installation' do @@ -424,58 +420,6 @@ describe 'neutron' do end end - shared_examples 'amqp support' do - context 'with default amqp parameters' do - it { should contain_oslo__messaging__amqp('neutron_config').with( - :server_request_prefix => '', - :broadcast_prefix => '', - :group_request_prefix => '', - :container_name => '', - :idle_timeout => '', - :trace => '', - :ssl_ca_file => '', - :ssl_cert_file => '', - :ssl_key_file => '', - :ssl_key_password => '', - :sasl_mechanisms => '', - :sasl_config_dir => '', - :sasl_config_name => '', - :username => '', - :password => '', - ) } - end - - context 'with overridden amqp parameters' do - before { params.merge!( - :amqp_idle_timeout => '60', - :amqp_trace => true, - :amqp_ssl_ca_file => '/path/to/ca.cert', - :amqp_ssl_cert_file => '/path/to/certfile', - :amqp_ssl_key_file => '/path/to/key', - :amqp_username => 'amqp_user', - :amqp_password => 'password', - ) } - - it { should contain_oslo__messaging__amqp('neutron_config').with( - :server_request_prefix => '', - :broadcast_prefix => '', - :group_request_prefix => '', - :container_name => '', - :idle_timeout => '60', - :trace => true, - :ssl_ca_file => '/path/to/ca.cert', - :ssl_cert_file => '/path/to/certfile', - :ssl_key_file => '/path/to/key', - :ssl_key_password => '', - :sasl_mechanisms => '', - :sasl_config_dir => '', - :sasl_config_name => '', - :username => 'amqp_user', - :password => 'password', - ) } - end - end - shared_examples 'with max_allowed_address_pair defined' do before do params.merge!(