Omit --deployed-server in master
... because the option is deprecated in master[1] and has no effect. Also, deployed-server-environment.yaml is not required when the --deployed-server option is used since stable/wallaby[2]. [1] c6cd190a9f63738deafa4c616e0be8e06afedc96 [2] d6fba3f09f8de569b7fcf2bd9519c3112b1cc056 Change-Id: I4411a06026fc5bdf69061a643bc731e91c27640c
This commit is contained in:
parent
27ca805b53
commit
20848d87ca
|
@ -249,9 +249,11 @@
|
||||||
- name: set the multinode args
|
- name: set the multinode args
|
||||||
set_fact:
|
set_fact:
|
||||||
multinode_args: >-
|
multinode_args: >-
|
||||||
|
{% if release in ['train'] %}
|
||||||
-e {{ overcloud_templates_path }}/environments/deployed-server-environment.yaml
|
-e {{ overcloud_templates_path }}/environments/deployed-server-environment.yaml
|
||||||
|
{% endif %}
|
||||||
--overcloud-ssh-user {{ undercloud_user }}
|
--overcloud-ssh-user {{ undercloud_user }}
|
||||||
{% if not undercloud_enable_nova|bool %}
|
{% if not undercloud_enable_nova|bool and release in ['train', 'wallaby'] %}
|
||||||
--deployed-server
|
--deployed-server
|
||||||
{% endif %}
|
{% endif %}
|
||||||
when: deploy_multinode|bool
|
when: deploy_multinode|bool
|
||||||
|
@ -266,9 +268,13 @@
|
||||||
set_fact:
|
set_fact:
|
||||||
hypervisor_wait: false
|
hypervisor_wait: false
|
||||||
multinode_args: >-
|
multinode_args: >-
|
||||||
|
{% if release in ['train'] %}
|
||||||
-e {{ overcloud_templates_path }}/environments/deployed-server-environment.yaml
|
-e {{ overcloud_templates_path }}/environments/deployed-server-environment.yaml
|
||||||
|
{% endif %}
|
||||||
-e {{ working_dir }}/overcloud-baremetal-deployed.yaml
|
-e {{ working_dir }}/overcloud-baremetal-deployed.yaml
|
||||||
|
{% if release in ['train', 'wallaby'] %}
|
||||||
--deployed-server
|
--deployed-server
|
||||||
|
{% endif %}
|
||||||
when: baremetal_provision|bool
|
when: baremetal_provision|bool
|
||||||
|
|
||||||
- name: set the OVN args
|
- name: set the OVN args
|
||||||
|
|
Loading…
Reference in New Issue