Merge pull request apache#44 from theopenlab/support-fwaas-v1-v2

Support both FWaaS v1 and v2 in OpenLab
bzhaoopenstack · Feb 7, 2018 · aa0e9b9 · aa0e9b9
2 parents ee2f330 + b44f31a
commit aa0e9b9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/playbooks/terraform-provider-openstack-acceptance-test-fwaas/run.yaml b/playbooks/terraform-provider-openstack-acceptance-test-fwaas/run.yaml
@@ -4,7 +4,7 @@
     - clone-devstack-gate-to-workspace
     - role: create-devstack-local-conf
       enable_services:
-        - 'fwaas'
+        - 'fwaas-v1'
     - install-devstack
   tasks:
     - shell:

diff --git a/roles/create-devstack-local-conf/tasks/main.yml b/roles/create-devstack-local-conf/tasks/main.yml
@@ -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
@@ -110,4 +126,4 @@
     chdir: '{{ ansible_user_dir }}/workspace'
   environment: '{{ zuul | zuul_legacy_vars }}'
   when:
-    - '"fwaas" in enable_services'
+    - '"fwaas-v2" in enable_services'