test-bifrost: use existing playbooks

Currently test-bifrost.yaml contains mostly copy-pastes from other
playbooks, make it import them instead.

This is a preparational step for the removal of test-bifrost.yaml
in favour of making test-bifrost.sh do exactly the same thing we
document for end users.

Change-Id: Id59da31dfe97c840ef5bee223c56245cc127c952
This commit is contained in:
Dmitry Tantsur 2020-09-09 15:38:19 +02:00
parent 20863aa734
commit 0c242face7
2 changed files with 8 additions and 58 deletions

View File

@ -8,10 +8,10 @@
---
- hosts: localhost
connection: local
name: "Executes install, enrollment, and testing in one playbook"
name: "Prepare testing environment"
become: no
gather_facts: yes
pre_tasks:
tasks:
- name: "Set testing to true"
set_fact:
testing: true
@ -21,61 +21,16 @@
copy_from_local_path: true
git_url_root: "{{ lookup('env', 'WORKSPACE') }}"
when: lookup('env', 'ZUUL_BRANCH') | length > 0
roles:
- role: bifrost-prep-for-install
when: not (skip_install | default(false) | bool)
environment:
http_proxy: "{{ lookup('env','http_proxy') }}"
https_proxy: "{{ lookup('env','https_proxy') }}"
- hosts: localhost
connection: local
name: "Executes install, enrollment, and testing in one playbook"
become: yes
gather_facts: yes
roles:
- role: bifrost-keystone-install
- role: bifrost-ironic-install
# NOTE(TheJulia): While the next step creates a ramdisk, some elements
# do not support ramdisk-image-create as they invoke steps to cleanup
# the ramdisk which causes ramdisk-image-create to believe it failed.
- role: bifrost-create-dib-image
dib_imagename: "{{ http_boot_folder }}/ipa"
build_ramdisk: false
dib_os_element: "{{ ipa_dib_os_element|default('debian') }}"
dib_os_release: "buster"
dib_elements: "ironic-python-agent-ramdisk {{ ipa_extra_dib_elements | default('') }}"
dib_packages: "bsdmainutils"
when: create_ipa_image | bool
# NOTE(TheJulia): This creates the guest image.
- role: bifrost-create-dib-image
dib_imagetype: "qcow2"
dib_imagename: "{{ deploy_image }}"
dib_os_element: "debian"
dib_os_release: "buster"
dib_elements: "vm enable-serial-console simple-init {{ extra_dib_elements|default('') }}"
when: create_image_via_dib | bool
- role: bifrost-keystone-client-config
user: "{{ ansible_env.SUDO_USER | default(ansible_user_id) }}"
clouds:
bifrost:
config_username: "{{ ironic.keystone.default_username }}"
config_password: "{{ ironic.keystone.default_password }}"
config_project_name: "baremetal"
config_region_name: "{{ keystone.bootstrap.region_name }}"
config_auth_url: "{{ keystone.bootstrap.public_url }}"
environment:
http_proxy: "{{ lookup('env','http_proxy') }}"
https_proxy: "{{ lookup('env','https_proxy') }}"
- import_playbook: install.yaml
- import_playbook: enroll-dynamic.yaml
- hosts: baremetal
name: "Enroll node with Ironic"
name: "Test introspection data"
become: no
connection: local
roles:
- role: ironic-enroll-dynamic
- role: ironic-inspect-node
when: inspect_nodes | default(false) | bool
- role: bifrost-test-inspection
when: inspect_nodes | default(false) | bool
@ -95,13 +50,7 @@
PATH: /usr/local/bin:{{ ansible_env.PATH }}
when: enable_inspector is defined and enable_inspector | bool
- hosts: baremetal
name: "Create configuration drive files and deploy machines"
become: no
connection: local
roles:
- role: bifrost-configdrives-dynamic
- role: bifrost-deploy-nodes-dynamic
- import_playbook: deploy-dynamic.yaml
- hosts: baremetal
name: "Prepare for deployment verification"

View File

@ -162,6 +162,7 @@ export BIFROST_INVENTORY_SOURCE=${BAREMETAL_DATA_FILE}
${ANSIBLE} -vvvv \
-i inventory/bifrost_inventory.py \
-i inventory/target \
${TEST_PLAYBOOK} \
-e use_cirros=${USE_CIRROS} \
-e testing_user=${TESTING_USER} \