From 0990282a22e48a744aec2312c4015ef8aad29137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Wed, 10 Feb 2021 19:50:28 +0100 Subject: [PATCH] '--network-ports' support in overcloud node (un)provison Add support for provisioning network-port as part of the node provisioning workflow. In the future enabling the option will also apply node nic-config to provisioned nodes. Related: blueprint network-data-v2-ports Change-Id: I246cc60dd15947a9f29e78636c21a2fe78dfef1d --- .../defaults/main.yml | 1 + .../molecule/default/converge.yml | 12 ++++++++++++ .../tripleo_overcloud_node_provision/tasks/main.yml | 1 + .../defaults/main.yml | 1 + .../molecule/default/converge.yml | 12 ++++++++++++ .../tasks/main.yml | 1 + 6 files changed, 28 insertions(+) diff --git a/roles/tripleo_overcloud_node_provision/defaults/main.yml b/roles/tripleo_overcloud_node_provision/defaults/main.yml index 9f88410..b6aa550 100644 --- a/roles/tripleo_overcloud_node_provision/defaults/main.yml +++ b/roles/tripleo_overcloud_node_provision/defaults/main.yml @@ -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: diff --git a/roles/tripleo_overcloud_node_provision/molecule/default/converge.yml b/roles/tripleo_overcloud_node_provision/molecule/default/converge.yml index cd3fd19..6b69369 100644 --- a/roles/tripleo_overcloud_node_provision/molecule/default/converge.yml +++ b/roles/tripleo_overcloud_node_provision/molecule/default/converge.yml @@ -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" diff --git a/roles/tripleo_overcloud_node_provision/tasks/main.yml b/roles/tripleo_overcloud_node_provision/tasks/main.yml index bc77fb9..78c8e81 100644 --- a/roles/tripleo_overcloud_node_provision/tasks/main.yml +++ b/roles/tripleo_overcloud_node_provision/tasks/main.yml @@ -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', '') }} diff --git a/roles/tripleo_overcloud_node_unprovision/defaults/main.yml b/roles/tripleo_overcloud_node_unprovision/defaults/main.yml index 738050d..5652599 100644 --- a/roles/tripleo_overcloud_node_unprovision/defaults/main.yml +++ b/roles/tripleo_overcloud_node_unprovision/defaults/main.yml @@ -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: diff --git a/roles/tripleo_overcloud_node_unprovision/molecule/default/converge.yml b/roles/tripleo_overcloud_node_unprovision/molecule/default/converge.yml index e500d89..99f593b 100644 --- a/roles/tripleo_overcloud_node_unprovision/molecule/default/converge.yml +++ b/roles/tripleo_overcloud_node_unprovision/molecule/default/converge.yml @@ -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" diff --git a/roles/tripleo_overcloud_node_unprovision/tasks/main.yml b/roles/tripleo_overcloud_node_unprovision/tasks/main.yml index 3ebf3b0..a813e36 100644 --- a/roles/tripleo_overcloud_node_unprovision/tasks/main.yml +++ b/roles/tripleo_overcloud_node_unprovision/tasks/main.yml @@ -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 }}