openstack
/
octavia-tempest-plugin
Code Issues Proposed changes

Merge "Enable KVM libvirt type on all scenario jobs"

This commit is contained in:
Zuul 2020-04-20 19:10:31 +00:00 committed by Gerrit Code Review
parent b67453f6f0 7cca66d7a1
commit 49460e413b
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
playbooks/Octavia-DSVM/pre.yaml
View File

@ -1,12 +0,0 @@
- hosts: all
name: Octavia DSVM jobs pre-run playbook
tasks:
- shell:
executable: /bin/bash
cmd: |
set -e
set -x
if $(egrep --quiet '(vmx|svm)' /proc/cpuinfo) && [[ ( ! $(hostname) =~ "ovh" && ! $(hostname) =~ "limestone" ) ]]; then
export DEVSTACK_GATE_LIBVIRT_TYPE=kvm
fi

19
zuul.d/jobs.yaml
View File

@ -36,11 +36,11 @@
parent: devstack-tempest
timeout: 7800
required-projects:
- openstack/devstack
- openstack/octavia
- openstack/octavia-lib
- openstack/octavia-tempest-plugin
- openstack/python-octaviaclient
pre-run: playbooks/Octavia-DSVM/pre.yaml
irrelevant-files:
- ^.*\.rst$
- ^api-ref/.*$
@ -51,6 +51,8 @@
devstack_localrc:
TEMPEST_PLUGINS: /opt/stack/octavia-tempest-plugin
USE_PYTHON3: true
LIBVIRT_TYPE: kvm
LIBVIRT_CPU_MODE: host-passthrough
devstack_local_conf:
post-config:
$OCTAVIA_CONF:
@ -88,11 +90,11 @@
parent: devstack-tempest-ipv6
timeout: 7800
required-projects:
- openstack/devstack
- openstack/octavia
- openstack/octavia-lib
- openstack/octavia-tempest-plugin
- openstack/python-octaviaclient
pre-run: playbooks/Octavia-DSVM/pre.yaml
irrelevant-files:
- ^.*\.rst$
- ^api-ref/.*$
@ -103,6 +105,8 @@
devstack_localrc:
TEMPEST_PLUGINS: /opt/stack/octavia-tempest-plugin
USE_PYTHON3: true
LIBVIRT_TYPE: kvm
LIBVIRT_CPU_MODE: host-passthrough
devstack_local_conf:
post-config:
$OCTAVIA_CONF:
@ -144,6 +148,8 @@
vars:
devstack_localrc:
DIB_LOCAL_ELEMENTS: openstack-ci-mirrors
LIBVIRT_TYPE: kvm
LIBVIRT_CPU_MODE: host-passthrough
devstack_local_conf:
post-config:
$OCTAVIA_CONF:
@ -231,6 +237,8 @@
HOST_IP: "{{ hostvars['controller']['nodepool']['private_ipv4'] }}"
TEMPEST_PLUGINS: /opt/stack/octavia-tempest-plugin
USE_PYTHON3: true
LIBVIRT_TYPE: kvm
LIBVIRT_CPU_MODE: host-passthrough
# Octavia specific settings
OCTAVIA_CONTROLLER_IP_PORT_LIST: 192.168.0.3:5555,192.168.0.4:5555
OCTAVIA_MGMT_PORT_IP: 192.168.0.3
@ -271,6 +279,8 @@
RABBIT_HOST: "{{ hostvars['controller']['nodepool']['private_ipv4'] }}"
GLANCE_HOSTPORT: "{{ hostvars['controller']['nodepool']['private_ipv4'] }}:9292"
USE_PYTHON3: true
LIBVIRT_TYPE: kvm
LIBVIRT_CPU_MODE: host-passthrough
# Octavia specific settings
OCTAVIA_CONTROLLER_IP_PORT_LIST: 192.168.0.3:5555,192.168.0.4:5555
OCTAVIA_NODE: subnode
@ -507,9 +517,13 @@
controller:
devstack_localrc:
USE_PYTHON3: False
LIBVIRT_TYPE: kvm
LIBVIRT_CPU_MODE: host-passthrough
controller2:
devstack_localrc:
USE_PYTHON3: False
LIBVIRT_TYPE: kvm
LIBVIRT_CPU_MODE: host-passthrough
- job:
name: octavia-v2-act-stdby-dsvm-scenario-two-node
@ -652,6 +666,7 @@
parent: octavia-v2-dsvm-scenario
required-projects:
- openstack/cinder
- openstack/devstack
- openstack/diskimage-builder
- openstack/octavia
- openstack/octavia-lib