From 99641cf7e07adf1bb76434279048ea7e23204c6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Mon, 7 Jun 2021 15:04:17 +0200 Subject: [PATCH] tripleo_overcloud_node_provision - add --network-config Add support to set '--network-config' when provisioning nodes. When using this option neutron port resources will be created and network configuration will be applied to the nodes as part of the node provisioning. Change-Id: I6409d1aa0cd9aeb4bdd9cf66424336fb70f60a39 --- .../defaults/main.yml | 1 + .../molecule/default/converge.yml | 12 ++++++++++++ .../tripleo_overcloud_node_provision/tasks/main.yml | 1 + 3 files changed, 14 insertions(+) diff --git a/roles/tripleo_overcloud_node_provision/defaults/main.yml b/roles/tripleo_overcloud_node_provision/defaults/main.yml index b6aa550..fb07af6 100644 --- a/roles/tripleo_overcloud_node_provision/defaults/main.yml +++ b/roles/tripleo_overcloud_node_provision/defaults/main.yml @@ -20,3 +20,4 @@ tripleo_overcloud_node_provision_stack: tripleo_overcloud_node_provision_timeout: 3700 tripleo_overcloud_node_provision_timeout_arg: tripleo_overcloud_node_provision_network_ports: +tripleo_overcloud_node_provision_network_config: diff --git a/roles/tripleo_overcloud_node_provision/molecule/default/converge.yml b/roles/tripleo_overcloud_node_provision/molecule/default/converge.yml index 6b69369..db295de 100644 --- a/roles/tripleo_overcloud_node_provision/molecule/default/converge.yml +++ b/roles/tripleo_overcloud_node_provision/molecule/default/converge.yml @@ -115,3 +115,15 @@ that: - tripleo_overcloud_node_provision_output == "overcloud node provision --network-ports" + + - name: Assert "tripleo_overcloud_node_provision_network_config" + include_role: + name: "tripleo_overcloud_node_provision" + vars: + tripleo_overcloud_node_provision_network_config: true + + - name: Validate tripleo_overcloud_node_provision_network_config + assert: + that: + - tripleo_overcloud_node_provision_output == + "overcloud node provision --network-config" diff --git a/roles/tripleo_overcloud_node_provision/tasks/main.yml b/roles/tripleo_overcloud_node_provision/tasks/main.yml index 78c8e81..40c083d 100644 --- a/roles/tripleo_overcloud_node_provision/tasks/main.yml +++ b/roles/tripleo_overcloud_node_provision/tasks/main.yml @@ -8,6 +8,7 @@ {{ 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_network_config | ternary('--network-config', '') }} {{ 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', '') }}