Merge pull request #1412 from rebtoor/fix/nova-verify-ironic-post-adoption-guard

nova_verify, pre_launch_ironic: fix ironic post-adoption provisioning

Author: openshift-merge-bot[bot]

tests/roles/dataplane_adoption/tasks/nova_verify.yaml

@@ -58,6 +58,7 @@
   when:
     - prelaunch_test_instance|bool
     - "'pre_launch_ironic.bash' in prelaunch_test_instance_scripts"
+    - ironic_post_adoption_create_instance|bool
   ansible.builtin.shell: |
     {{ shell_header }}
     {{ oc_header }}

tests/roles/development_environment/files/pre_launch_ironic.bash

@@ -132,6 +132,10 @@ else
   echo "Found $ACTIVE_NODES active node(s), skipping node management operations"
 fi
 
+# Ensure quota has headroom for pre-adoption and post-adoption test instances
+CURRENT_QUOTA=$(${BASH_ALIASES[openstack]} quota show -c instances -f value)
+${BASH_ALIASES[openstack]} quota set --instances $((CURRENT_QUOTA + 2)) default
+
 # Create test instance on baremetal
 if [[ "${PRE_LAUNCH_IRONIC_CREATE_INSTANCE,,}" != "false" ]]; then
   # Wait for nova to be aware of the node

tests/roles/ironic_adoption/defaults/main.yaml

@@ -109,3 +109,4 @@ ironic_retry_delay: 5
 ironic_post_adoption_manage_nodes: false
 ironic_post_adoption_inspect_nodes: false
 ironic_post_adoption_provide_nodes: false
+ironic_post_adoption_create_instance: true