diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-08-12 03:19:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-08-12 03:19:08 +0000 |
| commit | 699ec62274d909d61e2f1545342a1b6f48e44962 (patch) | |
| tree | 1d912a24caf580e6621662c41d78b23f5f8a18a1 /overcloud.j2.yaml | |
| parent | 0785c93df294620229a5dcbe8d27c3521016ce8a (diff) | |
| parent | d8e253182053d5e813cd2c067ee1da453813a2fc (diff) | |
Merge "Convert compute-role.yaml to role.role.j2.yaml"
Diffstat (limited to 'overcloud.j2.yaml')
| -rw-r--r-- | overcloud.j2.yaml | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index 2bfdf506..7241a974 100644 --- 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]} |