Deprecate messaging params replaced by global oslo params

Depends-On: I03900b39ab257a9563db37e403254b54f846c056 Change-Id: Ib55c72c0bab9aa0ffc05752a680f573cc351ae17
2018-04-29 20:46:36 -04:00 · 2018-04-29 20:46:36 -04:00 · 405366fa32
commit 405366fa32
parent 5fb6ae2378
18 changed files with 223 additions and 93 deletions
--- a/deployment/aodh/aodh-base.yaml
+++ b/deployment/aodh/aodh-base.yaml
@ -75,6 +75,19 @@ parameters:
        an SSL connection to the messaging host.
    type: string

+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed. They should not
+   be relied on for new deployments. If you have concerns regarding deprecated
+   parameters, please contact the TripleO development team on IRC or the
+   OpenStack mailing list.
+  parameters:
+  - RpcPort
+  - RpcUserName
+  - RpcPassword
+  - RpcUseSSL
+
 conditions:
  service_debug_unset: {equals : [{get_param: AodhDebug}, '']}

@ -102,11 +115,6 @@ outputs:
          - {get_param: AodhDebug }
        aodh::auth::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
        aodh::notification_driver: {get_param: NotificationDriver}
-        # TODO(ansmith): remove once p-t-o switches to oslo params
-        aodh::rabbit_userid: {get_param: RpcUserName}
-        aodh::rabbit_password: {get_param: RpcPassword}
-        aodh::rabbit_use_ssl: {get_param: RpcUseSSL}
-        aodh::rabbit_port: {get_param: RpcPort}
        aodh::keystone::authtoken::project_name: 'service'
        aodh::keystone::authtoken::user_domain_name: 'Default'
        aodh::keystone::authtoken::project_domain_name: 'Default'
--- a/deployment/barbican/barbican-api-container-puppet.yaml
+++ b/deployment/barbican/barbican-api-container-puppet.yaml
@ -161,6 +161,19 @@ parameters:
      Setting this to a unique value will re-run any deployment tasks which
      perform configuration on a Heat stack-update.

+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed. They should not
+   be relied on for new deployments. If you have concerns regarding deprecated
+   parameters, please contact the TripleO development team on IRC or the
+   OpenStack mailing list.
+  parameters:
+  - RpcPort
+  - RpcUserName
+  - RpcPassword
+  - RpcUseSSL
+
 conditions:
  service_debug_unset: {equals : [{get_param: BarbicanDebug}, '']}
  internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
@ -222,12 +235,6 @@ outputs:
              - {get_param: Debug }
              - {get_param: BarbicanDebug }
            barbican::api::notification_driver: {get_param: NotificationDriver}
-            # TODO(ansmith): remove once p-t-o switches to oslo params
-            barbican::api::rabbit_use_ssl: {get_param: RpcUseSSL}
-            barbican::api::rabbit_userid: {get_param: RpcUserName}
-            barbican::api::rabbit_password: {get_param: RpcPassword}
-            barbican::api::rabbit_port: {get_param: RpcPort}
-            barbican::api::rabbit_heartbeat_timeout_threshold: 60
            barbican::api::service_name: 'httpd'
            barbican::wsgi::apache::bind_host:
              str_replace:
--- a/deployment/ceilometer/ceilometer-base-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-base-container-puppet.yaml
@ -124,6 +124,10 @@ parameter_groups:
   OpenStack mailing list.
  parameters:
  - GnocchiArchivePolicy
+  - RpcPort
+  - RpcUserName
+  - RpcPassword
+  - RpcUseSSL

 conditions:
  service_debug_unset: {equals : [{get_param: CeilometerDebug}, '']}
@ -159,12 +163,6 @@ outputs:
        ceilometer::agent::auth::auth_project_domain_name: 'Default'
        ceilometer::agent::auth::auth_endpoint_type: 'internalURL'
        ceilometer::notification_driver: {get_param: NotificationDriver}
-        # TODO(ansmith): remove once p-t-o switches to oslo params
-        ceilometer::rabbit_userid: {get_param: RpcUserName}
-        ceilometer::rabbit_password: {get_param: RpcPassword}
-        ceilometer::rabbit_use_ssl: {get_param: RpcUseSSL}
-        ceilometer::rabbit_port: {get_param: RpcPort}
-        ceilometer::rabbit_heartbeat_timeout_threshold: 60
        ceilometer::telemetry_secret: {get_param: CeilometerMeteringSecret}
        ceilometer::snmpd_readonly_username: {get_param: SnmpdReadonlyUserName}
        ceilometer::snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
--- a/deployment/cinder/cinder-base.yaml
+++ b/deployment/cinder/cinder-base.yaml
@ -111,6 +111,19 @@ parameters:
    description: The password for the nova service and db account
    hidden: true

+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed. They should not
+   be relied on for new deployments. If you have concerns regarding deprecated
+   parameters, please contact the TripleO development team on IRC or the
+   OpenStack mailing list.
+  parameters:
+  - RpcPort
+  - RpcUserName
+  - RpcPassword
+  - RpcUseSSL
+
 conditions:
  service_debug_unset: {equals : [{get_param: CinderDebug}, '']}

@ -137,10 +150,6 @@ outputs:
          - {get_param: CinderDebug }
        cinder::storage_availability_zone: {get_param: CinderStorageAvailabilityZone}
        cinder::rabbit_heartbeat_timeout_threshold: 60
-        cinder::rabbit_userid: {get_param: RpcUserName}
-        cinder::rabbit_password: {get_param: RpcPassword}
-        cinder::rabbit_use_ssl: {get_param: RpcUseSSL}
-        cinder::rabbit_port: {get_param: RpcPort}
        cinder::cron::db_purge::destination: '/dev/null'
        cinder::db::database_db_max_retries: -1
        cinder::db::database_max_retries: -1
--- a/deployment/experimental/designate/designate-base.yaml
+++ b/deployment/experimental/designate/designate-base.yaml
@ -67,6 +67,19 @@ parameters:
    default: 'messagingv2'
    description: Driver or drivers to handle sending notifications.

+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed. They should not
+   be relied on for new deployments. If you have concerns regarding deprecated
+   parameters, please contact the TripleO development team on IRC or the
+   OpenStack mailing list.
+  parameters:
+  - RabbitPassword
+  - RabbitUserName
+  - RabbitClientUseSSL
+  - RabbitClientPort
+
 conditions:
  service_debug_unset: {equals : [{get_param: DesignateDebug}, '']}

@ -83,8 +96,3 @@ outputs:
          - {get_param: DesignateDebug }
         designate::purge_config: {get_param: EnableConfigPurge}
         designate::notification_driver: {get_param: NotificationDriver}
-         designate::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
-         designate::rabbit_userid: {get_param: RabbitUserName}
-         designate::rabbit_password: {get_param: RabbitPassword}
-         designate::rabbit_port: {get_param: RabbitClientPort}
-
--- a/deployment/glance/glance-api-container-puppet.yaml
+++ b/deployment/glance/glance-api-container-puppet.yaml
@ -219,6 +219,19 @@ parameters:
    description: The container image to use for the glance_api config_volume
    type: string

+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed. They should not
+   be relied on for new deployments. If you have concerns regarding deprecated
+   parameters, please contact the TripleO development team on IRC or the
+   OpenStack mailing list.
+  parameters:
+  - RpcPort
+  - RpcUserName
+  - RpcPassword
+  - RpcUseSSL
+
 conditions:

  internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
@ -371,11 +384,6 @@ outputs:
            glance::backend::rbd::rbd_store_pool: {get_param: GlanceRbdPoolName}
            glance::backend::rbd::rbd_store_user: {get_param: CephClientUserName}
            glance_backend: {get_param: GlanceBackend}
-            # TODO(ansmith): remove once p-t-o switches to oslo params
-            glance::notify::rabbitmq::rabbit_userid: {get_param: RpcUserName}
-            glance::notify::rabbitmq::rabbit_port: {get_param: RpcPort}
-            glance::notify::rabbitmq::rabbit_password: {get_param: RpcPassword}
-            glance::notify::rabbitmq::rabbit_use_ssl: {get_param: RpcUseSSL}
            glance::notify::rabbitmq::notification_driver: {get_param: NotificationDriver}
          -
            if:
--- a/deployment/heat/heat-base-puppet.yaml
+++ b/deployment/heat/heat-base-puppet.yaml
@ -143,6 +143,19 @@ parameters:
        an SSL connection to the messaging host.
    type: string

+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed. They should not
+   be relied on for new deployments. If you have concerns regarding deprecated
+   parameters, please contact the TripleO development team on IRC or the
+   OpenStack mailing list.
+  parameters:
+  - RpcPort
+  - RpcUserName
+  - RpcPassword
+  - RpcUseSSL
+
 conditions:
  service_debug_unset: {equals : [{get_param: HeatDebug}, '']}
  cors_allowed_origin_unset: {equals : [{get_param: HeatCorsAllowedOrigin}, '']}
@ -160,12 +173,7 @@ outputs:
            - {}
            - heat::cors::allowed_origin: {get_param: HeatCorsAllowedOrigin}
          - heat::notification_driver: {get_param: NotificationDriver}
-            # TODO(ansmith): remove once p-t-o switches to oslo params
-            heat::rabbit_userid: {get_param: RpcUserName}
-            heat::rabbit_password: {get_param: RpcPassword}
-            heat::rabbit_use_ssl: {get_param: RpcUseSSL}
-            heat::rabbit_port: {get_param: RpcPort}
-            heat::logging::debug:
+            heat::debug:
              if:
              - service_debug_unset
              - {get_param: Debug }
--- a/deployment/ironic/ironic-base-puppet.yaml
+++ b/deployment/ironic/ironic-base-puppet.yaml
@ -67,6 +67,19 @@ parameters:
        an SSL connection to the messaging host.
    type: string

+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed. They should not
+   be relied on for new deployments. If you have concerns regarding deprecated
+   parameters, please contact the TripleO development team on IRC or the
+   OpenStack mailing list.
+  parameters:
+  - RpcPort
+  - RpcUserName
+  - RpcPassword
+  - RpcUseSSL
+
 conditions:
  service_debug_unset: {equals : [{get_param: IronicDebug}, '']}
  default_rsc_unset: {equals : [{get_param: IronicDefaultResourceClass}, '']}
@ -94,11 +107,6 @@ outputs:
            - service_debug_unset
            - {get_param: Debug }
            - {get_param: IronicDebug }
-          # TODO(ansmith): remove once p-t-o switches to oslo params
-          ironic::rabbit_userid: {get_param: RpcUserName}
-          ironic::rabbit_password: {get_param: RpcPassword}
-          ironic::rabbit_port: {get_param: RpcPort}
-          ironic::rabbit_use_ssl: {get_param: RpcUseSSL}
        -
          if:
          - default_rsc_unset
--- a/deployment/keystone/keystone-container-puppet.yaml
+++ b/deployment/keystone/keystone-container-puppet.yaml
@ -359,6 +359,19 @@ parameters:
      Attribute to be used to obtain the entity ID of the Identity Provider
      from the environment.

+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed. They should not
+   be relied on for new deployments. If you have concerns regarding deprecated
+   parameters, please contact the TripleO development team on IRC or the
+   OpenStack mailing list.
+  parameters:
+  - RpcPort
+  - RpcUserName
+  - RpcPassword
+  - RpcUseSSL
+
 resources:

  ContainersCommon:
@ -451,11 +464,6 @@ outputs:
              - service_debug_unset
              - {get_param: Debug }
              - {get_param: KeystoneDebug }
-            # TODO(ansmith): remove once p-t-o switches to oslo params
-            keystone::rabbit_userid: {get_param: RpcUserName}
-            keystone::rabbit_password: {get_param: RpcPassword}
-            keystone::rabbit_use_ssl: {get_param: RpcUseSSL}
-            keystone::rabbit_port: {get_param: RpcPort}
            keystone::notification_driver: {get_param: NotificationDriver}
            keystone::notification_format: {get_param: KeystoneNotificationFormat}
            tripleo::profile::base::keystone::extra_notification_topics: {get_param: KeystoneNotificationTopics}
--- a/deployment/manila/manila-base.yaml
+++ b/deployment/manila/manila-base.yaml
@ -71,6 +71,19 @@ parameters:
        an SSL connection to the messaging host.
    type: string

+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed. They should not
+   be relied on for new deployments. If you have concerns regarding deprecated
+   parameters, please contact the TripleO development team on IRC or the
+   OpenStack mailing list.
+  parameters:
+  - RpcPort
+  - RpcUserName
+  - RpcPassword
+  - RpcUseSSL
+
 conditions:
  service_debug_unset: {equals : [{get_param: ManilaDebug}, '']}
  manila_ipv6: {equals : [{get_param: ManilaIPv6}, true]}
@ -82,12 +95,7 @@ outputs:
      service_name: manila_base
      config_settings:
        manila::notification_driver: {get_param: NotificationDriver}
-        # TODO(ansmith): remove once p-t-o switches to oslo params
-        manila::rabbit_userid: {get_param: RpcUserName}
-        manila::rabbit_password: {get_param: RpcPassword}
-        manila::rabbit_use_ssl: {get_param: RpcUseSSL}
-        manila::rabbit_port: {get_param: RpcPort}
-        manila::logging::debug:
+        manila::debug:
          if:
          - service_debug_unset
          - {get_param: Debug }
--- a/deployment/mistral/mistral-base.yaml
+++ b/deployment/mistral/mistral-base.yaml
@ -104,6 +104,19 @@ parameters:
    constraints:
      - range: { min: 0 }

+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed. They should not
+   be relied on for new deployments. If you have concerns regarding deprecated
+   parameters, please contact the TripleO development team on IRC or the
+   OpenStack mailing list.
+  parameters:
+  - RpcPort
+  - RpcUserName
+  - RpcPassword
+  - RpcUseSSL
+
 conditions:
  service_debug_unset: {equals : [{get_param: MistralDebug}, '']}

@ -124,12 +137,7 @@ outputs:
              read_default_file: /etc/my.cnf.d/tripleo.cnf
              read_default_group: tripleo
        mistral::notification_driver: {get_param: NotificationDriver}
-        # TODO(ansmith): remove once p-t-o switches to oslo params
-        mistral::rabbit_userid: {get_param: RpcUserName}
-        mistral::rabbit_password: {get_param: RpcPassword}
-        mistral::rabbit_use_ssl: {get_param: RpcUseSSL}
-        mistral::rabbit_port: {get_param: RpcPort}
-        mistral::logging::debug:
+        mistral::debug:
          if:
          - service_debug_unset
          - {get_param: Debug }
--- a/deployment/nova/nova-base-puppet.yaml
+++ b/deployment/nova/nova-base-puppet.yaml
@ -222,6 +222,18 @@ parameters:
    description: Whether this is an cell additional to the default cell.
    type: boolean

+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed. They should not
+   be relied on for new deployments. If you have concerns regarding deprecated
+   parameters, please contact the TripleO development team on IRC or the
+   OpenStack mailing list.
+  parameters:
+  - RpcPort
+  - RpcUserName
+  - RpcPassword
+
 conditions:

  compute_upgrade_level_empty: {equals : [{get_param: UpgradeLevelNovaCompute}, '']}
@ -254,11 +266,7 @@ outputs:
                "%{hiera('$NETWORK')}"
              params:
                $NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
-          # TODO(ansmith): remove once p-t-o switches to oslo params
-          nova::rabbit_password: {get_param: RpcPassword}
-          nova::rabbit_userid: {get_param: RpcUserName}
          nova::rabbit_use_ssl: {get_param: RpcUseSSL}
-          nova::rabbit_port: {get_param: RpcPort}
          nova::placement::project_name: 'service'
          nova::placement::password: {get_param: NovaPassword}
          nova::placement::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
@ -366,8 +374,4 @@ outputs:
          # complex cell v2 configurations. For now, this is the default cell
          # created for the cell v2 configuration
          nova::db::mysql_api::setup_cell0: true
-          # TODO(ansmith): remove once p-t-o switches to oslo params
-          nova::rabbit_password: {get_param: RpcPassword}
-          nova::rabbit_userid: {get_param: RpcUserName}
          nova::rabbit_use_ssl: {get_param: RpcUseSSL}
-          nova::rabbit_port: {get_param: RpcPort}
--- a/deployment/octavia/octavia-base.yaml
+++ b/deployment/octavia/octavia-base.yaml
@ -143,6 +143,19 @@ parameters:
    description: Time to wait for TCP packets for content inspection.
    type: number

+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed. They should not
+   be relied on for new deployments. If you have concerns regarding deprecated
+   parameters, please contact the TripleO development team on IRC or the
+   OpenStack mailing list.
+  parameters:
+  - RpcPort
+  - RpcUserName
+  - RpcPassword
+  - RpcUseSSL
+
 conditions:
  service_debug_unset: {equals : [{get_param: OctaviaDebug}, '']}
  octavia_ca_cert_unset: {equals: [{get_param: OctaviaCaCert}, '']}
@ -173,11 +186,6 @@ outputs:
                query:
                  read_default_file: /etc/my.cnf.d/tripleo.cnf
                  read_default_group: tripleo
-            # TODO(ansmith): remove once p-t-o switches to oslo params
-            octavia::rabbit_use_ssl: {get_param: RpcUseSSL}
-            octavia::rabbit_userid: {get_param: RpcUserName}
-            octavia::rabbit_password: {get_param: RpcPassword}
-            octavia::rabbit_port: {get_param: RpcPort}
            octavia::service_auth::auth_url: {get_param: [EndpointMap, KeystonePublic, uri]}
            octavia::service_auth::auth_type: 'password'
            octavia::service_auth::username: {get_param: OctaviaUserName}
--- a/deployment/sahara/sahara-base.yaml
+++ b/deployment/sahara/sahara-base.yaml
@ -77,6 +77,19 @@ parameters:
        an SSL connection to the messaging host.
    type: string

+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed. They should not
+   be relied on for new deployments. If you have concerns regarding deprecated
+   parameters, please contact the TripleO development team on IRC or the
+   OpenStack mailing list.
+  parameters:
+  - RpcPort
+  - RpcUserName
+  - RpcPassword
+  - RpcUseSSL
+
 conditions:
  service_debug_unset: {equals : [{get_param: SaharaDebug}, '']}

@ -97,12 +110,7 @@ outputs:
              read_default_file: /etc/my.cnf.d/tripleo.cnf
              read_default_group: tripleo
        sahara::notify::notification_driver: {get_param: NotificationDriver}
-        # TODO(ansmith): remove once p-t-o switches to oslo params
-        sahara::rabbit_password: {get_param: RpcPassword}
-        sahara::rabbit_user: {get_param: RpcUserName}
-        sahara::rabbit_use_ssl: {get_param: RpcUseSSL}
-        sahara::rabbit_port: {get_param: RpcPort}
-        sahara::logging::debug:
+        sahara::debug:
          if:
          - service_debug_unset
          - {get_param: Debug }
--- a/deployment/swift/swift-proxy-container-puppet.yaml
+++ b/deployment/swift/swift-proxy-container-puppet.yaml
@ -100,6 +100,18 @@ parameters:
    description: Indicate whether this resource may be shared with the domain received in the request
                 "origin" header.

+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed. They should not
+   be relied on for new deployments. If you have concerns regarding deprecated
+   parameters, please contact the TripleO development team on IRC or the
+   OpenStack mailing list.
+  parameters:
+  - RpcPort
+  - RpcUserName
+  - RpcPassword
+
 conditions:

  internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
@ -163,10 +175,6 @@ outputs:
            if:
            - ceilometer_pipeline_enabled
            -
-              # TODO(ansmith): remove once p-t-o switches to oslo params
-              swift::proxy::ceilometer::rabbit_user: {get_param: RpcUserName}
-              swift::proxy::ceilometer::rabbit_password: {get_param: RpcPassword}
-              swift::proxy::ceilometer::rabbit_use_ssl: {get_param: RpcUseSSL}
              swift::proxy::ceilometer::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
              swift::proxy::ceilometer::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
              swift::proxy::ceilometer::password: {get_param: SwiftPassword}
@ -174,7 +182,6 @@ outputs:
              swift::proxy::ceilometer::nonblocking_notify: true
            - {}
          - swift::proxy::staticweb::url_base: {get_param: [EndpointMap, SwiftPublic, uri_no_suffix]}
-            tripleo::profile::base::swift::proxy::rabbit_port: {get_param: RpcPort}
            tripleo::profile::base::swift::proxy::ceilometer_messaging_use_ssl: {get_param: RpcUseSSL}
            tripleo::profile::base::swift::proxy::ceilometer_enabled: {get_param: SwiftCeilometerPipelineEnabled}
            tripleo::swift_proxy::firewall_rules:
--- a/deployment/tacker/tacker-container-puppet.yaml
+++ b/deployment/tacker/tacker-container-puppet.yaml
@ -83,6 +83,19 @@ parameters:
        an SSL connection to the messaging host.
    type: string

+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed. They should not
+   be relied on for new deployments. If you have concerns regarding deprecated
+   parameters, please contact the TripleO development team on IRC or the
+   OpenStack mailing list.
+  parameters:
+  - RpcPort
+  - RpcUserName
+  - RpcPassword
+  - RpcUseSSL
+
 conditions:
  service_debug_unset: {equals : [{get_param: TackerDebug}, '']}

@ -118,11 +131,6 @@ outputs:
          - {get_param: Debug }
          - {get_param: TackerDebug }
        tacker::notification_driver: {get_param: NotificationDriver}
-        # TODO(ansmith): remove once p-t-o switches to oslo params
-        tacker::rabbit_userid: {get_param: RpcUserName}
-        tacker::rabbit_password: {get_param: RpcPassword}
-        tacker::rabbit_use_ssl: {get_param: RpcUseSSL}
-        tacker::rabbit_port: {get_param: RpcPort}
        tacker::server::bind_host:
          str_replace:
             template:
--- a/puppet/services/neutron-base.yaml
+++ b/puppet/services/neutron-base.yaml
@ -130,6 +130,19 @@ parameters:
        transparent networks.
    type: boolean

+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed. They should not
+   be relied on for new deployments. If you have concerns regarding deprecated
+   parameters, please contact the TripleO development team on IRC or the
+   OpenStack mailing list.
+  parameters:
+  - RpcPort
+  - RpcUserName
+  - RpcPassword
+  - RpcUseSSL
+
 conditions:
  dhcp_agents_zero: {equals : [{get_param: NeutronDhcpAgentsPerNetwork}, 0]}
  service_debug_unset: {equals : [{get_param: NeutronDebug}, '']}
@ -143,11 +156,6 @@ outputs:
      config_settings:
        map_merge:
          - neutron::notification_driver: {get_param: NotificationDriver}
-            # TODO(ansmith): remove once p-t-o switches to oslo params
-            neutron::rabbit_password: {get_param: RpcPassword}
-            neutron::rabbit_user: {get_param: RpcUserName}
-            neutron::rabbit_use_ssl: {get_param: RpcUseSSL}
-            neutron::rabbit_port: {get_param: RpcPort}
            neutron::core_plugin: {get_param: NeutronCorePlugin}
            neutron::service_plugins: {get_param: NeutronServicePlugins}
            neutron::logging::debug:
--- a/releasenotes/notes/oslo-messaging-separate-backends-2d2221066f88f479.yaml
+++ b/releasenotes/notes/oslo-messaging-separate-backends-2d2221066f88f479.yaml
@ -2,3 +2,12 @@
 features:
  - Support separate oslo.messaging services for RPC and Notifications.
    Enable separate messaging backend servers.
+deprecations:
+  - |
+    The rabbitmq server parameters have been replaced by corresponding
+    oslo messaging Rpc and Notify parameters in order to fully define
+    the backend deployment.
+    - RpcUserName, NotifyUserName replaces RabbitUserName
+    - RpcPassword, NotifyPassword replaces RabbitPassword
+    - RpcPort, NotifyPort replaces RabbitClientPort
+    - RpcUseSSL, NotifyUseSSL replaces RabbitClientUseSSL