From 06d6fb3bde5cb1e012c4e9e682f8eea1e386572a Mon Sep 17 00:00:00 2001 From: Alan Bishop Date: Wed, 15 May 2019 15:02:31 -0400 Subject: [PATCH] Remove extraneous references to RpcXXX parameters Remove references to RpcPort, RpcUserName, RpcPassword and RpcUseSSL from all templates that do not actually use the parameter. Change-Id: I295a7ae93feda24a179a53158ecfc633721bcd59 --- deployment/aodh/aodh-base.yaml | 31 ------------------ .../ceilometer-base-container-puppet.yaml | 22 ------------- deployment/cinder/cinder-base.yaml | 31 ------------------ .../glance/glance-api-container-puppet.yaml | 32 ------------------- deployment/heat/heat-base-puppet.yaml | 31 ------------------ deployment/ironic/ironic-base-puppet.yaml | 31 ------------------ .../keystone/keystone-container-puppet.yaml | 31 ------------------ deployment/manila/manila-base.yaml | 31 ------------------ deployment/mistral/mistral-base.yaml | 31 ------------------ deployment/neutron/neutron-base.yaml | 31 ------------------ deployment/nova/nova-base-puppet.yaml | 24 -------------- deployment/octavia/octavia-base.yaml | 31 ------------------ deployment/sahara/sahara-base.yaml | 31 ------------------ .../swift/swift-proxy-container-puppet.yaml | 24 -------------- .../tacker/tacker-container-puppet.yaml | 31 ------------------ 15 files changed, 443 deletions(-) diff --git a/deployment/aodh/aodh-base.yaml b/deployment/aodh/aodh-base.yaml index b467ee8385..1326d015e7 100644 --- a/deployment/aodh/aodh-base.yaml +++ b/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}, '']} diff --git a/deployment/ceilometer/ceilometer-base-container-puppet.yaml b/deployment/ceilometer/ceilometer-base-container-puppet.yaml index f72fd9806b..84ad095c70 100644 --- a/deployment/ceilometer/ceilometer-base-container-puppet.yaml +++ b/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}, '']} diff --git a/deployment/cinder/cinder-base.yaml b/deployment/cinder/cinder-base.yaml index d4bf82f58d..0ec77d0a1a 100644 --- a/deployment/cinder/cinder-base.yaml +++ b/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}, '']} diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml index eeb79c66ad..d5b5fa675f 100644 --- a/deployment/glance/glance-api-container-puppet.yaml +++ b/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]} diff --git a/deployment/heat/heat-base-puppet.yaml b/deployment/heat/heat-base-puppet.yaml index 7007a613c6..0d1a4cdd0d 100644 --- a/deployment/heat/heat-base-puppet.yaml +++ b/deployment/heat/heat-base-puppet.yaml @@ -124,37 +124,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}, '']} diff --git a/deployment/ironic/ironic-base-puppet.yaml b/deployment/ironic/ironic-base-puppet.yaml index 7b5efc11f5..0f610e0e70 100644 --- a/deployment/ironic/ironic-base-puppet.yaml +++ b/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}, '']} diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index 958420279b..9d777bada9 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/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: diff --git a/deployment/manila/manila-base.yaml b/deployment/manila/manila-base.yaml index 7ecafee91a..e5c10e9730 100644 --- a/deployment/manila/manila-base.yaml +++ b/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}, '']} diff --git a/deployment/mistral/mistral-base.yaml b/deployment/mistral/mistral-base.yaml index bc24500a2c..c2c5f5df9a 100644 --- a/deployment/mistral/mistral-base.yaml +++ b/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}, '']} diff --git a/deployment/neutron/neutron-base.yaml b/deployment/neutron/neutron-base.yaml index e202bc8490..d2eea05a5e 100644 --- a/deployment/neutron/neutron-base.yaml +++ b/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}, '']} diff --git a/deployment/nova/nova-base-puppet.yaml b/deployment/nova/nova-base-puppet.yaml index b40b946049..173d3ab5ca 100644 --- a/deployment/nova/nova-base-puppet.yaml +++ b/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}, '']} diff --git a/deployment/octavia/octavia-base.yaml b/deployment/octavia/octavia-base.yaml index 4f501ccd2b..d5e3d5e28d 100644 --- a/deployment/octavia/octavia-base.yaml +++ b/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}, '']} diff --git a/deployment/sahara/sahara-base.yaml b/deployment/sahara/sahara-base.yaml index 99fa3dbebf..1c7ca31054 100644 --- a/deployment/sahara/sahara-base.yaml +++ b/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}, '']} diff --git a/deployment/swift/swift-proxy-container-puppet.yaml b/deployment/swift/swift-proxy-container-puppet.yaml index 3800f619e1..aa22261e65 100644 --- a/deployment/swift/swift-proxy-container-puppet.yaml +++ b/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]} diff --git a/deployment/tacker/tacker-container-puppet.yaml b/deployment/tacker/tacker-container-puppet.yaml index 3cc764f780..962f81bf66 100644 --- a/deployment/tacker/tacker-container-puppet.yaml +++ b/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}, '']}