Merge "Remove extraneous references to RpcXXX parameters"

deployment/aodh/aodh-base.yaml

@@ -56,37 +56,6 @@ parameters:
     type: string
     default: 'messagingv2'
     description: Driver or drivers to handle sending notifications.
-  RpcPort:
-    default: 5672
-    description: The network port for messaging backend
-    type: number
-  RpcUserName:
-    default: guest
-    description: The username for messaging backend
-    type: string
-  RpcPassword:
-    description: The password for messaging backend
-    type: string
-    hidden: true
-  RpcUseSSL:
-    default: false
-    description: >
-        Messaging client subscriber parameter to specify
-        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}, '']}

deployment/ceilometer/ceilometer-base-container-puppet.yaml

@@ -114,24 +114,6 @@ parameters:
     default: 'ceilometer-low-rate'
     type: string
     description: (DEPRECATED) archive policy to use with gnocchi backend
-  RpcPort:
-    default: 5672
-    description: The network port for messaging backend
-    type: number
-  RpcUserName:
-    default: guest
-    description: The username for messaging backend
-    type: string
-  RpcPassword:
-    description: The password for messaging backend
-    type: string
-    hidden: true
-  RpcUseSSL:
-    default: false
-    description: >
-        Messaging client subscriber parameter to specify
-        an SSL connection to the messaging host.
-    type: string
 
 parameter_groups:
 - label: deprecated
@@ -142,10 +124,6 @@ parameter_groups:
    OpenStack mailing list.
   parameters:
   - GnocchiArchivePolicy
-  - RpcPort
-  - RpcUserName
-  - RpcPassword
-  - RpcUseSSL
 
 conditions:
   service_debug_unset: {equals : [{get_param: CeilometerDebug}, '']}

deployment/cinder/cinder-base.yaml

@@ -93,42 +93,11 @@ parameters:
     description: >
         Cron to move deleted instances to another table - Max Delay
     default: '3600'
-  RpcPort:
-    default: 5672
-    description: The network port for messaging backend
-    type: number
-  RpcUserName:
-    default: guest
-    description: The username for messaging backend
-    type: string
-  RpcPassword:
-    description: The password for messaging backend
-    type: string
-    hidden: true
-  RpcUseSSL:
-    default: false
-    description: >
-        Messaging client subscriber parameter to specify
-        an SSL connection to the messaging host.
-    type: string
   NovaPassword:
     type: string
     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}, '']}
 

deployment/glance/glance-api-container-puppet.yaml

@@ -175,25 +175,6 @@ parameters:
     type: string
     default: 'messagingv2'
     description: Driver or drivers to handle sending notifications.
-  RpcPort:
-    default: 5672
-    description: The network port for messaging backend
-    type: number
-  RpcUserName:
-    default: guest
-    description: The username for messaging backend
-    type: string
-  RpcPassword:
-    description: The password for messaging backend
-    type: string
-    hidden: true
-  RpcUseSSL:
-    default: false
-    description: >
-        Messaging client subscriber parameter to specify
-        an SSL connection to the messaging host.
-    type: string
-
   EnableInternalTLS:
     type: boolean
     default: false
@@ -235,19 +216,6 @@ 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]}

deployment/heat/heat-base-puppet.yaml

@@ -128,37 +128,6 @@ parameters:
     default: ''
     description: Indicate whether this resource may be shared with the domain received in the request
                  "origin" header.
-  RpcPort:
-    default: 5672
-    description: The network port for messaging backend
-    type: number
-  RpcUserName:
-    default: guest
-    description: The username for messaging backend
-    type: string
-  RpcPassword:
-    description: The password for messaging backend
-    type: string
-    hidden: true
-  RpcUseSSL:
-    default: false
-    description: >
-        Messaging client subscriber parameter to specify
-        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}, '']}

deployment/ironic/ironic-base-puppet.yaml

@@ -55,37 +55,6 @@ parameters:
     type: string
     constraints:
       - allowed_values: [ '', 'oslo', 'json-rpc']
-  RpcPort:
-    default: 5672
-    description: The network port for messaging backend
-    type: number
-  RpcUserName:
-    default: guest
-    description: The username for messaging backend
-    type: string
-  RpcPassword:
-    description: The password for messaging backend
-    type: string
-    hidden: true
-  RpcUseSSL:
-    default: false
-    description: >
-        Messaging client subscriber parameter to specify
-        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}, '']}

deployment/keystone/keystone-container-puppet.yaml

@@ -96,24 +96,6 @@ parameters:
     description: The keystone auth secret and db password.
     type: string
     hidden: true
-  RpcPort:
-    default: 5672
-    description: The network port for messaging backend
-    type: number
-  RpcUserName:
-    default: guest
-    description: The username for messaging backend
-    type: string
-  RpcPassword:
-    description: The password for messaging backend
-    type: string
-    hidden: true
-  RpcUseSSL:
-    default: false
-    description: >
-        Messaging client subscriber parameter to specify
-        an SSL connection to the messaging host.
-    type: string
   TokenExpiration:
     default: 3600
     description: Set a token expiration time in seconds.
@@ -359,19 +341,6 @@ 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:

deployment/manila/manila-base.yaml

@@ -52,37 +52,6 @@ parameters:
     type: string
     default: 'messagingv2'
     description: Driver or drivers to handle sending notifications.
-  RpcPort:
-    default: 5672
-    description: The network port for messaging backend
-    type: number
-  RpcUserName:
-    default: guest
-    description: The username for messaging backend
-    type: string
-  RpcPassword:
-    description: The password for messaging backend
-    type: string
-    hidden: true
-  RpcUseSSL:
-    default: false
-    description: >
-        Messaging client subscriber parameter to specify
-        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}, '']}

deployment/mistral/mistral-base.yaml

@@ -53,37 +53,6 @@ parameters:
     type: string
     default: 'messagingv2'
     description: Driver or drivers to handle sending notifications.
-  RpcPort:
-    default: 5672
-    description: The network port for messaging backend
-    type: number
-  RpcUserName:
-    default: guest
-    description: The username for messaging backend
-    type: string
-  RpcPassword:
-    description: The password for messaging backend
-    type: string
-    hidden: true
-  RpcUseSSL:
-    default: false
-    description: >
-        Messaging client subscriber parameter to specify
-        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: MistralDebug}, '']}

deployment/neutron/neutron-base.yaml

@@ -105,24 +105,6 @@ parameters:
     type: string
     default: 'messagingv2'
     description: Driver or drivers to handle sending notifications.
-  RpcPort:
-    default: 5672
-    description: The network port for messaging backend
-    type: number
-  RpcUserName:
-    default: guest
-    description: The username for messaging backend
-    type: string
-  RpcPassword:
-    description: The password for messaging backend
-    type: string
-    hidden: true
-  RpcUseSSL:
-    default: false
-    description: >
-        Messaging client subscriber parameter to specify
-        an SSL connection to the messaging host.
-    type: string
   EnableVLANTransparency:
     default: false
     description: >
@@ -130,19 +112,6 @@ 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}, '']}

deployment/nova/nova-base-puppet.yaml

@@ -207,18 +207,6 @@ parameters:
      Interval to sync power states between the database and the hypervisor. Set
      to -1 to disable. Setting this to 0 will run at the default rate.
    default: 0
-  RpcPort:
-    default: 5672
-    description: The network port for messaging backend
-    type: number
-  RpcUserName:
-    default: guest
-    description: The username for messaging backend
-    type: string
-  RpcPassword:
-    description: The password for messaging backend
-    type: string
-    hidden: true
   RpcUseSSL:
     default: false
     description: >
@@ -230,18 +218,6 @@ 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}, '']}

deployment/octavia/octavia-base.yaml

@@ -46,24 +46,6 @@ parameters:
     description: >
         Remove configuration that is not generated by TripleO. Used to avoid
         configuration remnants after upgrades.
-  RpcPort:
-    default: 5672
-    description: The network port for messaging backend
-    type: number
-  RpcUserName:
-    default: guest
-    description: The username for messaging backend
-    type: string
-  RpcPassword:
-    description: The password for messaging backend
-    type: string
-    hidden: true
-  RpcUseSSL:
-    default: false
-    description: >
-        Messaging client subscriber parameter to specify
-        an SSL connection to the messaging host.
-    type: string
   NotificationDriver:
     type: string
     default: 'messagingv2'
@@ -148,19 +130,6 @@ 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}, '']}

deployment/sahara/sahara-base.yaml

@@ -58,37 +58,6 @@ parameters:
                  in order to have a sane default for Pacemaker deployments when
                  not configuring this parameter by default.
     type: comma_delimited_list
-  RpcPort:
-    default: 5672
-    description: The network port for messaging backend
-    type: number
-  RpcUserName:
-    default: guest
-    description: The username for messaging backend
-    type: string
-  RpcPassword:
-    description: The password for messaging backend
-    type: string
-    hidden: true
-  RpcUseSSL:
-    default: false
-    description: >
-        Messaging client subscriber parameter to specify
-        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}, '']}

deployment/swift/swift-proxy-container-puppet.yaml

@@ -73,18 +73,6 @@ parameters:
     default: ['service']
     description: Comma-seperated list of project names to ignore.
     type: comma_delimited_list
-  RpcPort:
-    default: 5672
-    description: The network port for messaging backend
-    type: number
-  RpcUserName:
-    default: guest
-    description: The username for messaging backend
-    type: string
-  RpcPassword:
-    description: The password for messaging backend
-    type: string
-    hidden: true
   RpcUseSSL:
     default: false
     description: >
@@ -100,18 +88,6 @@ 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]}

deployment/tacker/tacker-container-puppet.yaml

@@ -64,37 +64,6 @@ parameters:
     type: string
     default: 'messagingv2'
     description: Driver or drivers to handle sending notifications.
-  RpcPort:
-    default: 5672
-    description: The network port for messaging backend
-    type: number
-  RpcUserName:
-    default: guest
-    description: The username for messaging backend
-    type: string
-  RpcPassword:
-    description: The password for messaging backend
-    type: string
-    hidden: true
-  RpcUseSSL:
-    default: false
-    description: >
-        Messaging client subscriber parameter to specify
-        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}, '']}