Merge "Designate: Clean up deprecated Rabbit* parameters"

deployment/designate/designate-base.yaml

@@ -41,24 +41,6 @@ parameters:
     description: >
         Remove configuration that is not generated by TripleO. Used to avoid
         configuration remnants after upgrades.
-  RabbitPassword:
-    description: The password for RabbitMQ
-    type: string
-    hidden: true
-  RabbitUserName:
-    default: guest
-    description: The username for RabbitMQ
-    type: string
-  RabbitClientUseSSL:
-    default: false
-    description: >
-        Rabbit client subscriber parameter to specify
-        an SSL connection to the RabbitMQ host.
-    type: string
-  RabbitClientPort:
-    default: 5672
-    description: Set rabbit subscriber port, change this if using SSL
-    type: number
   NotificationDriver:
     type: comma_delimited_list
     default: 'noop'
@@ -68,19 +50,6 @@ parameters:
     description: Designate's RPC response timeout, in seconds.
     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:
-  - RabbitPassword
-  - RabbitUserName
-  - RabbitClientUseSSL
-  - RabbitClientPort
-
 outputs:
   role_data:
     description: Base role data for Designate services