Merge "Remove some redundant tasks from cli-overcloud-node-unprovision.yaml"
This commit is contained in:
commit
05e35ddbed
|
@ -33,11 +33,10 @@
|
||||||
when:
|
when:
|
||||||
- baremetal_deployment is undefined
|
- baremetal_deployment is undefined
|
||||||
- fail:
|
- fail:
|
||||||
msg: unprovision_confirm or unprovision_environment is required when prompt is true
|
msg: unprovision_confirm is required when prompt is true
|
||||||
when:
|
when:
|
||||||
- prompt
|
- prompt
|
||||||
- unprovision_confirm is undefined
|
- unprovision_confirm is undefined
|
||||||
- unprovision_environment is undefined
|
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
|
|
||||||
|
@ -54,25 +53,10 @@
|
||||||
register: baremetal_existing
|
register: baremetal_existing
|
||||||
|
|
||||||
- name: Write unprovision confirmation
|
- name: Write unprovision confirmation
|
||||||
block:
|
copy:
|
||||||
- name: Write instances for confirmation
|
dest: "{{ unprovision_confirm }}"
|
||||||
copy:
|
content: "{{ baremetal_existing.instances | to_json }}"
|
||||||
dest: "{{ unprovision_confirm }}"
|
when: prompt|bool and unprovision_confirm is defined
|
||||||
content: "{{ baremetal_existing.instances | to_json }}"
|
|
||||||
when: unprovision_confirm is defined
|
|
||||||
- name: Expand roles for provisioned instances
|
|
||||||
tripleo_baremetal_expand_roles:
|
|
||||||
baremetal_deployment: "{{ baremetal_deployment }}"
|
|
||||||
stack_name: "{{ stack_name }}"
|
|
||||||
state: present
|
|
||||||
register: baremetal_instances_existing
|
|
||||||
when: unprovision_environment is defined
|
|
||||||
- name: Write environment for node delete resource mapping
|
|
||||||
copy:
|
|
||||||
dest: "{{ unprovision_environment }}"
|
|
||||||
content: "{{ baremetal_instances_existing.environment | to_json }}"
|
|
||||||
when: unprovision_environment is defined
|
|
||||||
when: prompt|bool
|
|
||||||
|
|
||||||
- name: Unprovision instances
|
- name: Unprovision instances
|
||||||
metalsmith_instances:
|
metalsmith_instances:
|
||||||
|
|
Loading…
Reference in New Issue