openstack
/
tripleo-operator-ansible
Code Issues Proposed changes

Merge "'--network-ports' support in overcloud node (un)provison"

This commit is contained in:
Zuul 2021-02-25 09:43:57 +00:00 committed by Gerrit Code Review
parent 0f96aeaf6c 0990282a22
commit 6ba3df5033
6 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/tripleo_overcloud_node_provision/defaults/main.yml
View File

@ -19,3 +19,4 @@ tripleo_overcloud_node_provision_rc_file: "{{ tripleo_rc_file | default(ansible_
tripleo_overcloud_node_provision_stack:
tripleo_overcloud_node_provision_timeout: 3700
tripleo_overcloud_node_provision_timeout_arg:
tripleo_overcloud_node_provision_network_ports:

12
roles/tripleo_overcloud_node_provision/molecule/default/converge.yml
View File

@ -103,3 +103,15 @@
that:
- tripleo_overcloud_node_provision_output ==
"overcloud node provision deploy.yaml"
- name: Assert "tripleo_overcloud_node_provision_network_ports"
include_role:
name: "tripleo_overcloud_node_provision"
vars:
tripleo_overcloud_node_provision_network_ports: true
- name: Validate tripleo_overcloud_node_provision_network_ports
assert:
that:
- tripleo_overcloud_node_provision_output ==
"overcloud node provision --network-ports"

1
roles/tripleo_overcloud_node_provision/tasks/main.yml
View File

@ -7,6 +7,7 @@
{{ openstack_bin }} overcloud node provision
{{ tripleo_overcloud_node_provision_output_file | ternary('-o $PROVISION_OUTPUT', '') }}
{{ tripleo_overcloud_node_provision_stack | ternary('--stack $PROVISION_STACK', '') }}
{{ tripleo_overcloud_node_provision_network_ports | ternary('--network-ports', '') }}
{{ tripleo_overcloud_node_provision_overcloud_ssh_user | ternary('--overcloud-ssh-user $PROVISION_USER', '') }}
{{ tripleo_overcloud_node_provision_overcloud_ssh_key | ternary('--overcloud-ssh-key $PROVISION_KEY', '') }}
{{ tripleo_overcloud_node_provision_concurrency | ternary('--concurrency $PROVISION_CONCURRENCY', '') }}

1
roles/tripleo_overcloud_node_unprovision/defaults/main.yml
View File

@ -14,3 +14,4 @@ tripleo_overcloud_node_unprovision_rc_file: "{{ tripleo_rc_file | default(ansibl
tripleo_overcloud_node_unprovision_stack:
tripleo_overcloud_node_unprovision_timeout: 3600
tripleo_overcloud_node_unprovision_yes: true
tripleo_overcloud_node_unprovision_network_ports:

12
roles/tripleo_overcloud_node_unprovision/molecule/default/converge.yml
View File

@ -55,3 +55,15 @@
that:
- tripleo_overcloud_node_unprovision_output ==
"overcloud node unprovision --yes foo.yaml"
- name: Assert "tripleo_overcloud_node_unprovision_network_ports"
include_role:
name: "tripleo_overcloud_node_unprovision"
vars:
tripleo_overcloud_node_unprovision_network_ports: true
- name: Validate tripleo_overcloud_node_unprovision_network_ports
assert:
that:
- tripleo_overcloud_node_unprovision_output ==
"overcloud node unprovision --network-ports --yes"

1
roles/tripleo_overcloud_node_unprovision/tasks/main.yml
View File

@ -6,6 +6,7 @@
{{ tripleo_overcloud_node_unprovision_os_cloud | ternary('', "source " ~ tripleo_overcloud_node_unprovision_rc_file ~ "; ") }}
{{ openstack_bin }} overcloud node unprovision
{{ tripleo_overcloud_node_unprovision_stack | ternary('--stack $UNPROVISION_STACK', '') }}
{{ tripleo_overcloud_node_unprovision_network_ports | ternary('--network-ports', '') }}
{{ tripleo_overcloud_node_unprovision_all | ternary('--all', '') }}
{{ tripleo_overcloud_node_unprovision_yes | ternary('--yes', '') }}
{{ tripleo_overcloud_node_unprovision_deployment_file }}