Merge "Revert "Disable [oslo_messaging_rabbit] heartbeat_in_pthread""

openstack-archive · Sep 8, 2022 · 6f3c092 · 6f3c092
2 parents 8c505c4 + 8272361
commit 6f3c092
Show file tree

Hide file tree

Showing 15 changed files with 0 additions and 21 deletions.
diff --git a/deployment/aodh/aodh-base.yaml b/deployment/aodh/aodh-base.yaml
@@ -93,7 +93,6 @@ outputs:
           - {get_param: Debug}
         aodh::notification_driver: {get_param: NotificationDriver}
         aodh::rpc_response_timeout: {get_param: AodhRpcResponseTimeout}
-        aodh::rabbit_heartbeat_in_pthread: false
         aodh::service_credentials::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
         aodh::service_credentials::password: {get_param: AodhPassword}
         aodh::service_credentials::region_name: {get_param: KeystoneRegion}

diff --git a/deployment/barbican/barbican-api-container-puppet.yaml b/deployment/barbican/barbican-api-container-puppet.yaml
@@ -281,7 +281,6 @@ outputs:
               - true
               - {get_param: Debug}
             barbican::api::notification_driver: {get_param: NotificationDriver}
-            barbican::api::rabbit_heartbeat_in_pthread: false
             barbican::api::service_name: 'httpd'
             barbican::api::enable_proxy_headers_parsing: true
             barbican::wsgi::apache::access_log_format: 'forwarded'

diff --git a/deployment/ceilometer/ceilometer-base-container-puppet.yaml b/deployment/ceilometer/ceilometer-base-container-puppet.yaml
@@ -94,7 +94,6 @@ outputs:
             ceilometer::telemetry_secret: {get_param: CeilometerMeteringSecret}
             ceilometer::host: "%{lookup('fqdn_canonical')}"
             ceilometer::rpc_response_timeout: {get_param: CeilometerRpcResponseTimeout}
-            ceilometer::rabbit_heartbeat_in_pthread: false
             ceilometer::db::sync_db: false
       service_config_settings:
         keystone:

diff --git a/deployment/cinder/cinder-base.yaml b/deployment/cinder/cinder-base.yaml
@@ -145,7 +145,6 @@ outputs:
         cinder::storage_availability_zone: {get_param: CinderStorageAvailabilityZone}
         cinder::rabbit_heartbeat_timeout_threshold: 60
         cinder::rpc_response_timeout: {get_param: CinderRpcResponseTimeout}
-        cinder::rabbit_heartbeat_in_pthread: false
         cinder::db::database_db_max_retries: -1
         cinder::db::database_max_retries: -1
         cinder::cron::db_purge::minute: {get_param: CinderCronDbPurgeMinute}

diff --git a/deployment/designate/designate-base.yaml b/deployment/designate/designate-base.yaml
@@ -69,6 +69,5 @@ outputs:
         designate::purge_config: {get_param: EnableConfigPurge}
         designate::notification_driver: {get_param: NotificationDriver}
         designate::rpc_response_timeout: {get_param: DesignateRpcResponseTimeout}
-        designate::rabbit_heartbeat_in_pthread: false
         designate::db::sync_db: false
         designate_enable_neutron_integration: {get_param: DesignateEnableNeutronIntegration}
diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml
@@ -590,7 +590,6 @@ outputs:
             tripleo::profile::base::glance::api::multistore_config: {get_param: GlanceMultistoreConfig}
             tripleo::profile::base::glance::backend::rbd::glance_rbd_ceph_conf_path: {get_param: CephConfigPath}
             glance::notify::rabbitmq::notification_driver: {get_param: NotificationDriver}
-            glance::notify::rabbitmq::rabbit_heartbeat_in_pthread: false
             glance::cron::db_purge::minute: {get_param: GlanceCronDbPurgeMinute}
             glance::cron::db_purge::hour: {get_param: GlanceCronDbPurgeHour}
             glance::cron::db_purge::monthday: {get_param: GlanceCronDbPurgeMonthday}

diff --git a/deployment/heat/heat-base-puppet.yaml b/deployment/heat/heat-base-puppet.yaml
@@ -194,7 +194,6 @@ outputs:
             heat::enable_proxy_headers_parsing: true
             heat::rpc_response_timeout: {get_param: HeatRpcResponseTimeout}
             heat::rabbit_heartbeat_timeout_threshold: 60
-            heat::rabbit_heartbeat_in_pthread: false
             heat::region_name: {get_param: KeystoneRegion}
             heat::keystone::authtoken::project_name: 'service'
             heat::keystone::authtoken::user_domain_name: 'Default'

diff --git a/deployment/ironic/ironic-base-puppet.yaml b/deployment/ironic/ironic-base-puppet.yaml
@@ -110,6 +110,5 @@ outputs:
           - rpc_transport_set
           - {get_param: IronicRpcTransport}
         ironic::rpc_response_timeout: {get_param: IronicRpcResponseTimeout}
-        ironic::rabbit_heartbeat_in_pthread: false
       step_config: |
         include tripleo::profile::base::ironic
diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml
@@ -578,7 +578,6 @@ outputs:
             keystone::cron::trust_flush::destination: {get_param: KeystoneCronTrustFlushDestination}
             keystone::cron::trust_flush::user: {get_param: KeystoneCronTrustFlushUser}
             keystone::rabbit_heartbeat_timeout_threshold: 60
-            keystone::rabbit_heartbeat_in_pthread: false
             keystone::service_name: 'httpd'
             keystone::enable_ssl: {get_param: EnableInternalTLS}
             keystone::wsgi::apache::access_log_format: 'forwarded'

diff --git a/deployment/manila/manila-base.yaml b/deployment/manila/manila-base.yaml
@@ -98,7 +98,6 @@ outputs:
         manila::network::neutron::network_plugin_ipv4_enabled:
           if: [{get_param: ManilaIPv6}, false, true]
         manila::rpc_response_timeout: {get_param: ManilaRpcResponseTimeout}
-        manila::rabbit_heartbeat_in_pthread: false
       service_config_settings:
         mysql:
           manila::db::mysql::password: {get_param: ManilaPassword}

diff --git a/deployment/neutron/neutron-base.yaml b/deployment/neutron/neutron-base.yaml
@@ -162,7 +162,6 @@ outputs:
             neutron::db::sync::extra_params: {get_param: NeutronDBSyncExtraParams}
             neutron::vlan_transparent: {get_param: EnableVLANTransparency}
             neutron::rpc_response_timeout: {get_param: NeutronRpcResponseTimeout}
-            neutron::rabbit_heartbeat_in_pthread: false
           - if:
             - dhcp_agents_set
             - tripleo::profile::base::neutron::dhcp_agents_per_network: {get_param: NeutronDhcpAgentsPerNetwork}
diff --git a/deployment/nova/nova-base-puppet.yaml b/deployment/nova/nova-base-puppet.yaml
@@ -253,7 +253,6 @@ outputs:
           nova::cache::enabled: {get_param: EnableCache}
           nova::cache::tls_enabled: {get_param: MemcachedTLS}
           nova::rpc_response_timeout: {get_param: NovaRpcResponseTimeout}
-          nova::rabbit_heartbeat_in_pthread: false
           nova::upgrade_level_compute:
             if:
             - compute_upgrade_level_set

diff --git a/deployment/octavia/octavia-base.yaml b/deployment/octavia/octavia-base.yaml
@@ -323,7 +323,6 @@ outputs:
             octavia::networking::port_detach_timeout: {get_param: OctaviaPortDetachTimeout}
             octavia::nova::enable_anti_affinity: {get_param: OctaviaAntiAffinity}
             octavia::rpc_response_timeout: {get_param: OctaviaRpcResponseTimeout}
-            octavia::rabbit_heartbeat_in_pthread: false
             octavia::controller::loadbalancer_topology:
               if:
                 - octavia_topology_set

diff --git a/deployment/swift/swift-proxy-container-puppet.yaml b/deployment/swift/swift-proxy-container-puppet.yaml
@@ -211,7 +211,6 @@ outputs:
               swift::proxy::ceilometer::region_name: {get_param: KeystoneRegion}
               swift::proxy::ceilometer::ignore_projects: {get_param: SwiftCeilometerIgnoreProjects}
               swift::proxy::ceilometer::nonblocking_notify: true
-              swift::proxy::ceilometer::rabbit_heartbeat_in_pthread: false
           - swift::proxy::staticweb::url_base: {get_param: [EndpointMap, SwiftPublic, uri_no_suffix]}
             tripleo::profile::base::swift::proxy::ceilometer_enabled: {get_param: SwiftCeilometerPipelineEnabled}
             swift::proxy::keystone::operator_roles:

diff --git a/releasenotes/notes/rabbit_heartbeat_in_pthread-bc71d5dcd4e3a99d.yaml b/releasenotes/notes/rabbit_heartbeat_in_pthread-bc71d5dcd4e3a99d.yaml