Browse Source

Merge "Use no-op drivers for Octavia in gate" into stable/queens

changes/96/677396/1
Zuul 1 month ago
parent
commit
fedcbb84bf
3 changed files with 4 additions and 7 deletions
  1. 0
    1
      .zuul.yaml
  2. 4
    0
      playbooks/devstack/functional/run.yaml
  3. 0
    6
      playbooks/get_amphora_tarball.yaml

+ 0
- 1
.zuul.yaml View File

@@ -28,7 +28,6 @@
28 28
       - ^heat/locale/.*$
29 29
       - ^heat/tests/.*$
30 30
       - ^releasenotes/.*$
31
-    pre-run: playbooks/get_amphora_tarball.yaml
32 31
     vars:
33 32
       disable_convergence: 'false'
34 33
       sql: mysql

+ 4
- 0
playbooks/devstack/functional/run.yaml View File

@@ -69,6 +69,10 @@
69 69
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMP_IMAGE_FILE=/tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2"
70 70
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMP_IMAGE_SIZE=3"
71 71
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMP_IMAGE_NAME=test-only-amphora-x64-haproxy-ubuntu-xenial"
72
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMPHORA_DRIVER=amphora_noop_driver"
73
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_COMPUTE_DRIVER=compute_noop_driver"
74
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_NETWORK_DRIVER=network_noop_driver"
75
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"DISABLE_AMP_IMAGE_BUILD=True"
72 76
           # enabling lbaas plugin does not enable the lbaasv2 service, explicitly enable it
73 77
           services+=,q-lbaasv2,octavia,o-cw,o-hk,o-hm,o-api
74 78
           export PROJECTS="openstack/barbican $PROJECTS"

+ 0
- 6
playbooks/get_amphora_tarball.yaml View File

@@ -1,6 +0,0 @@
1
-- hosts: primary
2
-  tasks:
3
-    - name: Download amphora tarball
4
-      get_url:
5
-        url: "https://tarballs.openstack.org/octavia/test-images/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2"
6
-        dest: /tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2

Loading…
Cancel
Save