From 6e7a431df0b7790512eb1920500b8878701c691a Mon Sep 17 00:00:00 2001 From: James Slagle Date: Mon, 16 Oct 2017 12:06:02 -0400 Subject: [PATCH] Remove deprecation handling from custom roles For deployed-server custom roles, the deprecation handlings are removed. As these have always been custom roles with definitions generated from role.role.j2.yaml, these original (now deprecated) param names were never present for anyone using this deployed-server roles data file. Specifically, deprecated_server_resource_name is quite troublesome as it will cause the server resources to get replaced on upgrade as the resource name changes. These were all introduced in If4a8388634fb1dcbb47beeabbd3db005abc80d4e, and this commit removes them. Change-Id: I1c1267f19db972b55466f4649eda62dd7814b94a Closes-Bug: #1723177 --- .../deployed-server-roles-data.yaml | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/deployed-server/deployed-server-roles-data.yaml b/deployed-server/deployed-server-roles-data.yaml index 81cd279c19..ef0c760768 100644 --- a/deployed-server/deployed-server-roles-data.yaml +++ b/deployed-server/deployed-server-roles-data.yaml @@ -34,12 +34,6 @@ - StorageMgmt - Tenant HostnameFormatDefault: '%stackname%-controller-%index%' - # Deprecated & backward-compatible values (FIXME: Make parameters consistent) - # Set uses_deprecated_params to True if any deprecated params are used. - uses_deprecated_params: True - deprecated_param_extraconfig: 'controllerExtraConfig' - deprecated_param_flavor: 'OvercloudControlFlavor' - deprecated_param_image: 'controllerImage' ServicesDefault: - OS::TripleO::Services::AodhApi - OS::TripleO::Services::AodhEvaluator @@ -175,15 +169,6 @@ - InternalApi - Tenant - Storage - # Deprecated & backward-compatible values (FIXME: Make parameters consistent) - # Set uses_deprecated_params to True if any deprecated params are used. - uses_deprecated_params: True - deprecated_param_image: 'NovaImage' - deprecated_param_extraconfig: 'NovaComputeExtraConfig' - deprecated_param_metadata: 'NovaComputeServerMetadata' - deprecated_param_scheduler_hints: 'NovaComputeSchedulerHints' - deprecated_param_ips: 'NovaComputeIPs' - deprecated_server_resource_name: 'NovaCompute' ServicesDefault: - OS::TripleO::Services::AuditD - OS::TripleO::Services::CACerts @@ -258,13 +243,6 @@ - InternalApi - Storage - StorageMgmt - # Deprecated & backward-compatible values (FIXME: Make parameters consistent) - # Set uses_deprecated_params to True if any deprecated params are used. - uses_deprecated_params: True - deprecated_param_metadata: 'SwiftStorageServerMetadata' - deprecated_param_ips: 'SwiftStorageIPs' - deprecated_param_image: 'SwiftStorageImage' - deprecated_param_flavor: 'OvercloudSwiftStorageFlavor' disable_upgrade_deployment: True ServicesDefault: - OS::TripleO::Services::AuditD