Convert compute-role.yaml to role.role.j2.yaml

[apex-tripleo-heat-templates.git] / overcloud.j2.yaml

diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 2bfdf50..7241a97 100644 (file)
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -186,11 +186,12 @@ parameters:
 
 {% if role.name != 'Compute' %}
   {{role.name}}SchedulerHints:
+    description: Optional scheduler hints to pass to nova
 {% else %}
   NovaComputeSchedulerHints:
+    description: DEPRECATED - use ComputeSchedulerHints instead
 {% endif %}
     type: json
-    description: Optional scheduler hints to pass to nova
     default: {}
 
   {{role.name}}Parameters:
@@ -224,13 +225,6 @@ parameters:
     description: >
       List of server hostnames to blacklist from any triggered deployments.
 
-parameter_groups:
-- label: deprecated
-  description: Do not use deprecated params, they will be removed.
-  parameters:
-  - controllerExtraConfig
-  - NovaComputeExtraConfig
-
 conditions:
   add_vips_to_etc_hosts: {equals : [{get_param: AddVipsToEtcHosts}, True]}