Merge "Add tripleo-operator for import nodes"
This commit is contained in:
commit
bf0f619544
roles/overcloud-prep-images
@ -31,13 +31,32 @@
|
||||
changed_when: true
|
||||
when: undercloud_enable_nova|bool
|
||||
|
||||
- name: Import and register overcloud nodes
|
||||
shell: >
|
||||
set -o pipefail &&
|
||||
{{ working_dir }}/overcloud-import-nodes.sh 2>&1 {{ timestamper_cmd }} >
|
||||
{{ overcloud_import_nodes_log }}
|
||||
changed_when: true
|
||||
when: step_register|bool
|
||||
- name: Run import nodes
|
||||
when:
|
||||
- step_register|bool
|
||||
block:
|
||||
- name: Import and register overcloud nodes - legacy
|
||||
when:
|
||||
- release in ['queens', 'rocky', 'stein', 'train']
|
||||
shell: >
|
||||
set -o pipefail &&
|
||||
{{ working_dir }}/overcloud-import-nodes.sh 2>&1 {{ timestamper_cmd }} >
|
||||
{{ overcloud_import_nodes_log }}
|
||||
changed_when: true
|
||||
|
||||
- name: Run import nodes via tripleo-operator-ansible
|
||||
when:
|
||||
- release not in ['queens', 'rocky', 'stein', 'train']
|
||||
collections:
|
||||
- tripleo.operator
|
||||
include_role:
|
||||
name: tripleo_overcloud_node_import
|
||||
vars:
|
||||
tripleo_overcloud_node_import_debug: true
|
||||
tripleo_os_cloud: undercloud
|
||||
tripleo_overcloud_node_import_provide: "{{ not step_introspect|bool and not step_introspect_with_retry|bool }}"
|
||||
tripleo_overcloud_node_import_log: "{{ overcloud_import_nodes_log }}"
|
||||
tripleo_overcloud_node_import_environment_file: instackenv.json
|
||||
|
||||
- name: Set root device size
|
||||
shell: >
|
||||
|
@ -17,10 +17,7 @@ source {{ working_dir }}/stackrc
|
||||
## * Register nodes with Ironic.
|
||||
## ::
|
||||
|
||||
{% if release in ['mitaka'] %}
|
||||
openstack baremetal import --json instackenv.json
|
||||
openstack baremetal configure boot
|
||||
{% elif step_introspect|bool or step_introspect_with_retry|bool %}
|
||||
{% if step_introspect|bool or step_introspect_with_retry|bool %}
|
||||
openstack overcloud node import instackenv.json
|
||||
{% else %}
|
||||
openstack overcloud node import instackenv.json --provide
|
||||
|
Loading…
x
Reference in New Issue
Block a user