openstack/bifrost
Code Issues Proposed changes

Merge "Test redeploy-dynamic when cirros/tinyipa are used"

Browse Source
This commit is contained in:
Zuul 2022-07-15 15:58:51 +00:00 committed by Gerrit Code Review
commit 8f85e01fe1
5 changed files with 57 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
playbooks/redeploy-dynamic.yaml
View File

@ -24,6 +24,14 @@
name: "Collect facts"
become: no
gather_facts: yes
- hosts: baremetal
name: "Pull cloud configuration"
become: no
connection: local
roles:
- role: bifrost-cloud-config
- hosts: baremetal
name: "Unprovision the nodes"
become: no
@ -31,29 +39,37 @@
pre_tasks:
- name: "Pull initial ironic facts"
openstack.cloud.baremetal_node_info:
cloud: "{{ cloud_name | default(omit) }}"
auth_type: "{{ auth_type | default(omit) }}"
auth: "{{ auth | default(omit) }}"
ca_cert: "{{ tls_certificate_path | default(omit) }}"
node: "{{ inventory_hostname }}"
ironic_url: "{{ ironic_url | default(omit) }}"
register: node_info
register: redeployed_node
roles:
- role: bifrost-unprovision-node-dynamic
when:
- node_info.baremetal_nodes[0].provision_state == "active"
or node_info.baremetal_nodes[0].provision_state == "deploy failed"
or node_info.baremetal_nodes[0].provision_state == "error"
- not node_info.baremetal_nodes[0].maintenance | bool
- redeployed_node.baremetal_nodes[0].provision_state == "active"
or redeployed_node.baremetal_nodes[0].provision_state == "deploy failed"
or redeployed_node.baremetal_nodes[0].provision_state == "error"
# The field was renamed in ansible-collections-openstack 2.0.0
# FIXME(dtantsur) Remove the workaround once we require >=2.0.0
# - not redeployed_node.baremetal_nodes[0].is_maintenance | bool
- not redeployed_node.baremetal_nodes[0].maintenance | default(false) | bool
- not redeployed_node.baremetal_nodes[0].is_maintenance | default(false) | bool
post_tasks:
- name: "Pull ironic facts until provision state available"
openstack.cloud.baremetal_node_info:
cloud: "{{ cloud_name | default(omit) }}"
auth_type: "{{ auth_type | default(omit) }}"
auth: "{{ auth | default(omit) }}"
ca_cert: "{{ tls_certificate_path | default(omit) }}"
node: "{{ inventory_hostname }}"
ironic_url: "{{ ironic_url | default(omit) }}"
register: node_info
until: node_info.baremetal_nodes[0].provision_state == "available"
retries: "{{ available_state_wait_retries | default(15) }}"
register: redeployed_node
until: redeployed_node.baremetal_nodes[0].provision_state == "available"
# The timeout of 15 minutes accounts for cleaning
retries: "{{ available_state_wait_retries | default(45) }}"
delay: "{{ provision_state_retry_interval | default(20) }}"
- hosts: baremetal
name: "Activate the nodes"
become: no
@ -61,20 +77,29 @@
roles:
- role: bifrost-configdrives-dynamic
when:
- node_info.baremetal_nodes[0].provision_state == "available"
- not node_info.baremetal_nodes[0].maintenance | bool
- redeployed_node.baremetal_nodes[0].provision_state == "available"
# The field was renamed in ansible-collections-openstack 2.0.0
# FIXME(dtantsur) Remove the workaround once we require >=2.0.0
# - not redeployed_node.baremetal_nodes[0].is_maintenance | bool
- not redeployed_node.baremetal_nodes[0].maintenance | default(false) | bool
- not redeployed_node.baremetal_nodes[0].is_maintenance | default(false) | bool
- role: bifrost-deploy-nodes-dynamic
when:
- node_info.baremetal_nodes[0].provision_state == "available"
- not node_info.baremetal_nodes[0].maintenance | bool
- redeployed_node.baremetal_nodes[0].provision_state == "available"
# The field was renamed in ansible-collections-openstack 2.0.0
# FIXME(dtantsur) Remove the workaround once we require >=2.0.0
# - not redeployed_node.baremetal_nodes[0].is_maintenance | bool
- not redeployed_node.baremetal_nodes[0].maintenance | default(false) | bool
- not redeployed_node.baremetal_nodes[0].is_maintenance | default(false) | bool
post_tasks:
- name: "Pull ironic facts until provision state active"
openstack.cloud.baremetal_node_info:
cloud: "{{ cloud_name | default(omit) }}"
auth_type: "{{ auth_type | default(omit) }}"
auth: "{{ auth | default(omit) }}"
ca_cert: "{{ tls_certificate_path | default(omit) }}"
node: "{{ inventory_hostname }}"
ironic_url: "{{ ironic_url | default(omit) }}"
register: node_info
until: node_info.baremetal_nodes[0].provision_state == "active"
register: redeployed_node
until: redeployed_node.baremetal_nodes[0].provision_state == "active"
retries: "{{ active_state_wait_retries | default(30) }}"
delay: "{{ provision_state_retry_interval | default(20) }}"

4
playbooks/roles/bifrost-cloud-config/defaults/main.yml
View File

@ -1,4 +1,8 @@
---
# Ensure that Ansible is using python interpreter and dependencies inside the bifrost virtual environment
bifrost_venv_dir: "{{ lookup('env', 'VENV') or '/opt/stack/bifrost' }}"
ansible_python_interpreter: "{{ bifrost_venv_dir + '/bin/python3' }}"
noauth_mode: false
network_interface: "virbr0"

3
playbooks/test-bifrost.yaml
View File

@ -57,6 +57,9 @@
roles:
- role: bifrost-test-vm
- import_playbook: redeploy-dynamic.yaml
when: redeploy_nodes | default(false) | bool
- hosts: baremetal
connection: local
name: "Unprovisions the test node"

5
releasenotes/notes/test-redeploy-b802726ffc137793.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixes the ``redeploy-dynamic`` playbook to work with TLS and other
non-default cloud settings.

3
scripts/test-bifrost.sh
View File

@ -108,6 +108,8 @@ elif [ ${ENABLE_KEYSTONE} = "true" ]; then
CLOUD_CONFIG+=" -e cloud_name=bifrost"
fi
REDEPLOY_NODES=$USE_CIRROS
if [[ -n "$BOOT_MODE" ]]; then
CLOUD_CONFIG+=" -e default_boot_mode=$BOOT_MODE"
VM_SETUP_EXTRA+=" -e default_boot_mode=$BOOT_MODE"
@ -187,6 +189,7 @@ ${ANSIBLE} -vvvv \
-e inventory_dhcp_static_ip=${INVENTORY_DHCP_STATIC_IP} \
-e enable_inspector=${USE_INSPECTOR} \
-e inspect_nodes=${INSPECT_NODES} \
-e redeploy_nodes=${REDEPLOY_NODES} \
-e download_ipa=${DOWNLOAD_IPA} \
-e create_ipa_image=${CREATE_IPA_IMAGE} \
-e write_interfaces_file=${WRITE_INTERFACES_FILE} \