Skip to content

Commit

Permalink
Support both FWaaS v1 and v2 in OpenLab
Browse files Browse the repository at this point in the history
Some SDK/Tools project still support FWaaS v1, like
terraform-provider-openstack, even if OpenStack FWaaS team have not
added any new feature into v1. OpenLab should support to run tests
against FWaaS both v1 and v2, let SDK/Tools project to choose run which
one.

Fixes: apache#43
  • Loading branch information
kiwik committed Feb 6, 2018
1 parent ee2f330 commit b44f31a
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
- clone-devstack-gate-to-workspace
- role: create-devstack-local-conf
enable_services:
- 'fwaas'
- 'fwaas-v1'
- install-devstack
tasks:
- shell:
Expand Down
20 changes: 18 additions & 2 deletions roles/create-devstack-local-conf/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,23 @@
when:
- '"lbaas" in enable_services'

- name: create devstack local conf with fwaas enabled

- name: create devstack local conf with fwaas v1 enabled
shell:
cmd: |
set -e
set -x
cat << EOF >> /tmp/dg-local.conf
enable_service q-fwaas-v1
enable_plugin neutron-fwaas https://git.openstack.org/openstack/neutron-fwaas
EOF
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
when:
- '"fwaas-v1" in enable_services'

- name: create devstack local conf with fwaas v2 enabled
shell:
cmd: |
set -e
Expand All @@ -110,4 +126,4 @@
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
when:
- '"fwaas" in enable_services'
- '"fwaas-v2" in enable_services'

0 comments on commit b44f31a

Please sign in to comment.