diff options
| author | Zuul <zuul@review.openstack.org> | 2018-06-13 11:13:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-06-13 11:13:54 +0000 |
| commit | f55a39989dea5f94cde25db97e6af72d3ec0e6e5 (patch) | |
| tree | 53e2f39de4df410ed5b82346c1968088f43ba4ab /playbooks/legacy/tempest-dsvm-ironic-inspector | |
| parent | 0fdd8c3195ab4b2e300cf63a8be9b3755881f02a (diff) | |
| parent | 500ca210467d6d709fb0e537e52143c47f080020 (diff) | |
| download | ironic-f55a39989dea5f94cde25db97e6af72d3ec0e6e5.tar.gz | |
Merge "Consolidate the setting of ironic-extra-vars"
Diffstat (limited to 'playbooks/legacy/tempest-dsvm-ironic-inspector')
| -rw-r--r-- | playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml index 351e5e76f..1dc57deb0 100644 --- a/playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml +++ b/playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml @@ -8,38 +8,17 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384" export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa" - EOF - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - cat << 'EOF' >> ironic-extra-vars export DEVSTACK_GATE_TEMPEST_REGEX="InspectorBasicTest" - EOF - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - cat << 'EOF' >> ironic-extra-vars export PROJECTS="openstack/ironic-inspector $PROJECTS" - export PROJECTS="openstack/python-ironic-inspector-client $PROJECTS" - export DEVSTACK_GATE_IRONIC_INSPECTOR=1 - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector git://git.openstack.org/openstack/ironic-inspector" + export PROJECTS="openstack/python-ironic-inspector-client $PROJECTS" + export DEVSTACK_GATE_IRONIC_INSPECTOR=1 - export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_MANAGE_FIREWALL=True" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector git://git.openstack.org/openstack/ironic-inspector" - EOF - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' + # Make IPXE configuration consistent between Mitaka and Master + export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_MANAGE_FIREWALL=True" - - shell: - cmd: | - cat << 'EOF' >> ironic-vars-early - # use tempest plugin export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'" export TEMPEST_CONCURRENCY=1 |