diff options
| author |   Steven Hardy <shardy@redhat.com> | 2017-07-11 15:45:52 +0100 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2017-08-11 15:06:34 +0100 |
| commit | d8e253182053d5e813cd2c067ee1da453813a2fc (patch) | |
| tree | 9a148c84679815c672e2c70eb18a339028350a1c /overcloud.j2.yaml | |
| parent | 1aad286ca39b59d1193d53db9ec25751b5854d48 (diff) | |
Convert compute-role.yaml to role.role.j2.yaml
Add some special-casing for backwards compatibility, such that the
Compute role can be rendered via j2 for support of composable networks.
Change-Id: Ieee446583f77bb9423609d444c576788cf930121
Partially-Implements: blueprint composable-networks
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]} |