Merge "Zuul: do not use USE_PYTHON3"
This commit is contained in:
@@ -4,7 +4,6 @@
|
|||||||
timeout: 10800
|
timeout: 10800
|
||||||
vars:
|
vars:
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
USE_PYTHON3: true
|
|
||||||
OSPROFILER_COLLECTOR: redis
|
OSPROFILER_COLLECTOR: redis
|
||||||
OSPROFILER_HMAC_KEYS: "neutron-hmac-key-used-in-zuul-ci"
|
OSPROFILER_HMAC_KEYS: "neutron-hmac-key-used-in-zuul-ci"
|
||||||
Q_ML2_TENANT_NETWORK_TYPE: vxlan
|
Q_ML2_TENANT_NETWORK_TYPE: vxlan
|
||||||
@@ -180,7 +179,6 @@
|
|||||||
# is finished or the mech driver does not call monkey_patch().
|
# is finished or the mech driver does not call monkey_patch().
|
||||||
Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn
|
Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn
|
||||||
Q_ML2_TENANT_NETWORK_TYPE: geneve
|
Q_ML2_TENANT_NETWORK_TYPE: geneve
|
||||||
USE_PYTHON3: true
|
|
||||||
PHYSICAL_NETWORK: public
|
PHYSICAL_NETWORK: public
|
||||||
Q_USE_PROVIDERNET_FOR_PUBLIC: true
|
Q_USE_PROVIDERNET_FOR_PUBLIC: true
|
||||||
ENABLE_CHASSIS_AS_GW: true
|
ENABLE_CHASSIS_AS_GW: true
|
||||||
|
@@ -536,7 +536,6 @@
|
|||||||
PHYSICAL_NETWORK: public
|
PHYSICAL_NETWORK: public
|
||||||
ENABLE_CHASSIS_AS_GW: false
|
ENABLE_CHASSIS_AS_GW: false
|
||||||
OVN_DBS_LOG_LEVEL: dbg
|
OVN_DBS_LOG_LEVEL: dbg
|
||||||
USE_PYTHON3: True
|
|
||||||
ENABLE_TLS: True
|
ENABLE_TLS: True
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
|
@@ -498,7 +498,6 @@
|
|||||||
ENABLE_CHASSIS_AS_GW: true
|
ENABLE_CHASSIS_AS_GW: true
|
||||||
OVN_L3_CREATE_PUBLIC_NETWORK: true
|
OVN_L3_CREATE_PUBLIC_NETWORK: true
|
||||||
OVN_DBS_LOG_LEVEL: dbg
|
OVN_DBS_LOG_LEVEL: dbg
|
||||||
USE_PYTHON3: True
|
|
||||||
BUILD_TIMEOUT: 784
|
BUILD_TIMEOUT: 784
|
||||||
ENABLE_TLS: True
|
ENABLE_TLS: True
|
||||||
OVN_IGMP_SNOOPING_ENABLE: True
|
OVN_IGMP_SNOOPING_ENABLE: True
|
||||||
|
Reference in New Issue
Block a user