openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Use integrated repo scenario for Calico job

Browse Source 
(cherry picked from commit 9b7b6b292b33f28cdd530655df7dea12b8e88ed1)

Depends-On: I730673ccf6957bb24a5d5677543644aab4ab2420
Depends-On: I40905d79efa1bef9ae6a7678515fd07fde1bdd00
Depends-On: Iaf392898c072ac4b39d878bb27654406c5ab0d8b
Change-Id: I9f58b567937c4481b679e009ce88dd47f9ad1e4f
This commit is contained in:
Logan V 2019-03-22 14:39:13 -04:00
parent b4fca4d051
commit 07888d8a29
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@ -460,8 +460,8 @@ neutron_management_ip: 127.0.0.1
# Calico Felix agent upstream settings
calico_felix_url: "https://github.com/projectcalico/felix/releases/download/{{ calico_felix_version }}/calico-felix-amd64"
calico_felix_version: v3.5.2
calico_felix_sha256: f7901c1b9e41c74c36b0ba2119c42c02ac6227af505f5bc571cee29e37b1550a
calico_felix_version: v3.7.0
calico_felix_sha256: ae0bed304702097cee0ad5d9b4abb07b263deeb46ac21f2bcb0118d5bf439f46
calico_felix_validate_certs: yes
# OVN Defaults

6
zuul.d/jobs.yaml
View File

@ -32,10 +32,10 @@
tox_env: ovn
- job:
name: openstack-ansible-calico-ubuntu-xenial
parent: openstack-ansible-functional-ubuntu-xenial
name: openstack-ansible-deploy-aio_metal_calico-ubuntu-bionic
parent: openstack-ansible-deploy-aio_metal-ubuntu-bionic
vars:
tox_env: calico
scenario: aio_metal_calico
- job:
name: openstack-ansible-opendaylight-ubuntu-xenial

4
zuul.d/project.yaml
View File

@ -25,8 +25,7 @@
- openstack-ansible-ovs-ubuntu-xenial
- openstack-ansible-ovn-ubuntu-xenial
- openstack-ansible-ovn-centos-7
- openstack-ansible-calico-ubuntu-xenial:
voting: false
- openstack-ansible-deploy-aio_metal_calico-ubuntu-bionic
- openstack-ansible-opendaylight-ubuntu-xenial
- openstack-ansible-ovs-nsh-ubuntu-xenial
- openstack-ansible-odl-sfc-ubuntu-xenial
@ -41,6 +40,7 @@
- openstack-ansible-ovs-ubuntu-xenial
- openstack-ansible-ovn-ubuntu-xenial
- openstack-ansible-ovn-centos-7
- openstack-ansible-deploy-aio_metal_calico-ubuntu-bionic
- openstack-ansible-opendaylight-ubuntu-xenial
- openstack-ansible-ovs-nsh-ubuntu-xenial
- openstack-ansible-odl-sfc-ubuntu-xenial