Sync fs002 for baremetal provisioing
`baremetal_provision` is ussuri+ for other scenarios, With this patch syncing fs002 to also provision baremetals using the new method instead of nova for ussuri branch. Also, Turning off nova in undercloud for ussuri+ as it is not required anymore if we are not doing provisioning using nova. Change-Id: Idc1e8667d2f599b6f1ad1d199c862f2079196ec8
This commit is contained in:
parent
d1d7aa3829
commit
75ff816126
|
@ -59,12 +59,19 @@ undercloud_clean_nodes: >-
|
|||
{%- endif -%}
|
||||
|
||||
baremetal_provision: >-
|
||||
{% if release in ['newton','ocata','pike','queens','stein','train', 'ussuri'] -%}
|
||||
{% if release in ['newton','ocata','pike','queens','stein','train'] -%}
|
||||
false
|
||||
{%- else -%}
|
||||
true
|
||||
{%- endif -%}
|
||||
|
||||
undercloud_enable_nova: >-
|
||||
{% if release in ['train'] -%}
|
||||
true
|
||||
{%- else -%}
|
||||
false
|
||||
{%- endif -%}
|
||||
|
||||
# Provision composable networks prior to creating the heat stack
|
||||
network_provision: >-
|
||||
{% if release in ['newton','ocata','pike','queens','stein','train','ussuri','victoria'] -%}
|
||||
|
@ -105,7 +112,7 @@ extra_args: >-
|
|||
{% if release not in ['newton', 'ocata', 'pike'] %}
|
||||
-e {{ overcloud_templates_path }}/ci/environments/ovb-ha.yaml
|
||||
{% endif %}
|
||||
{% if release not in ['newton','ocata','pike','queens','stein','train', 'ussuri'] -%}
|
||||
{% if release not in ['newton','ocata','pike','queens','stein','train'] -%}
|
||||
--disable-validations
|
||||
{%- endif -%}
|
||||
# keep the doc gen settings at the bottom of the config file.
|
||||
|
|
Loading…
Reference in New Issue