Merge "Prepare reno for TripleO Pike RC1"

[apex-tripleo-heat-templates.git] / roles_data.yaml

diff --git a/roles_data.yaml b/roles_data.yaml
index 0d6c803..bde656f 100644 (file)
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -19,6 +19,12 @@
     - 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
@@ -41,6 +47,7 @@
     - OS::TripleO::Services::CinderApi
     - OS::TripleO::Services::CinderBackendDellPs
     - OS::TripleO::Services::CinderBackendDellSc
+    - OS::TripleO::Services::CinderBackendDellEMCUnity
     - OS::TripleO::Services::CinderBackendNetApp
     - OS::TripleO::Services::CinderBackendScaleIO
     - OS::TripleO::Services::CinderBackendVRTSHyperScale
@@ -145,6 +152,15 @@
     - Tenant
     - Storage
   HostnameFormatDefault: '%stackname%-novacompute-%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_image: 'NovaImage'
+  deprecated_param_extraconfig: 'NovaComputeExtraConfig'
+  deprecated_param_metadata: 'NovaComputeServerMetadata'
+  deprecated_param_scheduler_hints: 'NovaComputeSchedulerHints'
+  deprecated_param_ips: 'NovaComputeIPs'
+  deprecated_server_resource_name: 'NovaCompute'
   disable_upgrade_deployment: True
   ServicesDefault:
     - OS::TripleO::Services::AuditD
@@ -222,6 +238,13 @@
     - 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