Browse Source

Merge "Revert "Make the metalsmith module interactions more resilient""

tags/1.6.0
Zuul 4 weeks ago
committed by Gerrit Code Review
parent
commit
3d53035e39
2 changed files with 0 additions and 10 deletions
  1. +0
    -6
      tripleo_ansible/playbooks/cli-overcloud-node-provision.yaml
  2. +0
    -4
      tripleo_ansible/playbooks/cli-overcloud-node-unprovision.yaml

+ 0
- 6
tripleo_ansible/playbooks/cli-overcloud-node-provision.yaml View File

@@ -101,9 +101,6 @@
state: reserved
clean_up: true
register: baremetal_reserved
until: baremetal_reserved is success
retries: 3
delay: 2

# NOTE(cloudnull): This limits the concurrency so that we're not adding
# more threads than needed.
@@ -123,9 +120,6 @@
timeout: "{{ node_timeout }}"
concurrency: "{{ runtime_concurrency }}"
register: baremetal_provisioned
until: baremetal_provisioned is success
retries: 3
delay: 2

- name: Populate environment
tripleo_baremetal_populate_environment:


+ 0
- 4
tripleo_ansible/playbooks/cli-overcloud-node-unprovision.yaml View File

@@ -79,7 +79,3 @@
instances: "{{ baremetal_existing.instances }}"
state: absent
when: not prompt|bool
register: baremetal_unprovisioned
until: baremetal_unprovisioned is success
retries: 3
delay: 2

Loading…
Cancel
Save