Merge pull request apache#189 from hongbin/revert-171-gophercloud

Revert "Enable Octavia in gophercloud jobs"
bzhaoopenstack · May 1, 2018 · afa2ef1 · afa2ef1
2 parents 97a1953 + 7231f36
commit afa2ef1
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/playbooks/gophercloud-acceptance-test/run.yaml b/playbooks/gophercloud-acceptance-test/run.yaml
@@ -7,7 +7,6 @@
         - 'manila'
         - 'designate'
         - 'zun'
-        - 'lbaas'
     - install-devstack
   tasks:
     - name: Run acceptance tests with gophercloud
@@ -50,7 +49,6 @@
               go test -v -tags "fixtures acceptance" ./acceptance/openstack/networking/v2/
               go test -v -tags "fixtures acceptance" ./acceptance/openstack/blockstorage/v2/
               go test -v -tags "fixtures acceptance" -run "SecGroup|Flavor" ./acceptance/openstack/compute/v2/
-              go test -v -tags "fixtures acceptance" ./acceptance/openstack/loadbalancer/v2/
               # To enable more after the fix of https://github.com/gophercloud/gophercloud/issues/608
               # go test -v -tags "fixtures acceptance" ./acceptance/openstack/imageservice/v2/
               # go test -v -tags "fixtures acceptance" ./acceptance/openstack/identity/v2/

diff --git a/roles/install-devstack/tasks/main.yml b/roles/install-devstack/tasks/main.yml
@@ -19,10 +19,6 @@
       export PROJECTS="openstack/devstack-plugin-container $PROJECTS"
       export PROJECTS="openstack/kuryr-libnetwork $PROJECTS"
       export PROJECTS="openstack/zun openstack/zun-tempest-plugin $PROJECTS"
-      export PROJECTS="openstack/diskimage-builder $PROJECTS"
-      export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-      export PROJECTS="openstack/neutron-lbaas $PROJECTS"
-      export PROJECTS="openstack/octavia openstack/python-octaviaclient $PROJECTS"
 
       cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
       ./safe-devstack-vm-gate-wrap.sh