From 3d5b46834a61ff7b03768b4df4901a75fe064c70 Mon Sep 17 00:00:00 2001 From: Samuel Toledo Date: Wed, 9 Aug 2023 08:57:10 -0300 Subject: [PATCH] Remove rabbitmq dependencies from sysinv puppet Continuing the efforts from [1], this review consists in removing all dependencies related to amqp classes as well as initializations for rabbitmq variables. This removal can be done because sysinv does not use rabbitmq. Test plan PASS - Perform fresh install and bootstrap in an AIO-SX successfully PASS - Perform fresh install and bootstrap in an AIO-DX successfully PASS - Run any system command successfully (system host-list, system application-list, etc) Story: 2010802 Task: 48578 [1] - https://storyboard.openstack.org/#!/story/2010802 Change-Id: I5da60b97ac8808d95d5b76ade065ea521e62e251 Signed-off-by: Samuel Toledo --- .../src/sysinv/manifests/base.pp | 20 ++++------------ .../src/sysinv/manifests/init.pp | 23 ------------------- .../src/modules/platform/manifests/sysinv.pp | 5 ---- 3 files changed, 4 insertions(+), 44 deletions(-) diff --git a/modules/puppet-sysinv/src/sysinv/manifests/base.pp b/modules/puppet-sysinv/src/sysinv/manifests/base.pp index 4e207b472..f263a7a00 100644 --- a/modules/puppet-sysinv/src/sysinv/manifests/base.pp +++ b/modules/puppet-sysinv/src/sysinv/manifests/base.pp @@ -15,13 +15,7 @@ # class sysinv::base ( - $rabbit_password, $sql_connection, - $rabbit_host = '127.0.0.1', - $rabbit_port = 5672, - $rabbit_hosts = undef, - $rabbit_virtual_host = '/', - $rabbit_userid = 'nova', $package_ensure = 'present', $api_paste_config = '/etc/sysinv/api-paste.ini', $verbose = false @@ -30,16 +24,10 @@ class sysinv::base ( warning('The sysinv::base class is deprecated. Use sysinv instead.') class { '::sysinv': - rabbit_password => $rabbit_password, - sql_connection => $sql_connection, - rabbit_host => $rabbit_host, - rabbit_port => $rabbit_port, - rabbit_hosts => $rabbit_hosts, - rabbit_virtual_host => $rabbit_virtual_host, - rabbit_userid => $rabbit_userid, - package_ensure => $package_ensure, - api_paste_config => $api_paste_config, - verbose => $verbose, + sql_connection => $sql_connection, + package_ensure => $package_ensure, + api_paste_config => $api_paste_config, + verbose => $verbose, } } diff --git a/modules/puppet-sysinv/src/sysinv/manifests/init.pp b/modules/puppet-sysinv/src/sysinv/manifests/init.pp index 7e36aab78..b606b6e0d 100644 --- a/modules/puppet-sysinv/src/sysinv/manifests/init.pp +++ b/modules/puppet-sysinv/src/sysinv/manifests/init.pp @@ -32,12 +32,6 @@ class sysinv ( $rpc_zeromq_conductor_bind_port = '9501', $rpc_zeromq_agent_bind_port = '9502', $control_exchange = 'openstack', - $rabbit_host = '127.0.0.1', - $rabbit_port = 5672, - $rabbit_hosts = false, - $rabbit_virtual_host = '/', - $rabbit_userid = 'guest', - $rabbit_password = false, $qpid_hostname = 'localhost', $qpid_port = '5672', $qpid_username = 'guest', @@ -123,26 +117,9 @@ class sysinv ( if $rpc_backend == 'sysinv.openstack.common.rpc.impl_kombu' { - if ! $rabbit_password { - fail('Please specify a rabbit_password parameter.') - } - sysinv_config { - 'DEFAULT/rabbit_password': value => $rabbit_password, secret => true; - 'DEFAULT/rabbit_userid': value => $rabbit_userid; - 'DEFAULT/rabbit_virtual_host': value => $rabbit_virtual_host; 'DEFAULT/control_exchange': value => $control_exchange; } - - if $rabbit_hosts { - sysinv_config { 'DEFAULT/rabbit_hosts': value => join($rabbit_hosts, ',') } - sysinv_config { 'DEFAULT/rabbit_ha_queues': value => true } - } else { - sysinv_config { 'DEFAULT/rabbit_host': value => $rabbit_host } - sysinv_config { 'DEFAULT/rabbit_port': value => $rabbit_port } - sysinv_config { 'DEFAULT/rabbit_hosts': value => "${rabbit_host}:${rabbit_port}" } - sysinv_config { 'DEFAULT/rabbit_ha_queues': value => false } - } } if $rpc_backend == 'sysinv.openstack.common.rpc.impl_qpid' { diff --git a/puppet-manifests/src/modules/platform/manifests/sysinv.pp b/puppet-manifests/src/modules/platform/manifests/sysinv.pp index 62b385929..48716cafe 100644 --- a/puppet-manifests/src/modules/platform/manifests/sysinv.pp +++ b/puppet-manifests/src/modules/platform/manifests/sysinv.pp @@ -12,7 +12,6 @@ class platform::sysinv Anchor['platform::services'] -> Class[$name] include ::platform::params - include ::platform::amqp::params include ::platform::drbd::platform::params # sysinv-agent is started on all hosts @@ -46,10 +45,6 @@ class platform::sysinv } -> class { '::sysinv': - rabbit_host => $::platform::amqp::params::host_url, - rabbit_port => $::platform::amqp::params::port, - rabbit_userid => $::platform::amqp::params::auth_user, - rabbit_password => $::platform::amqp::params::auth_password, fm_catalog_info => $fm_catalog_info, fernet_key_repository => "${keystone_key_repo_path}/fernet-keys", }