openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Use integrated repo scenario for Calico job

Browse Source 
Depends-On: I9f7b046b85203da20f022b6ee959290485b6aabd
Depends-On: Iaf392898c072ac4b39d878bb27654406c5ab0d8b
Change-Id: I9f58b567937c4481b679e009ce88dd47f9ad1e4f
This commit is contained in:
Logan V 2019-03-22 14:39:13 -04:00
parent 9f619e3f05
commit 9b7b6b292b
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

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

6
zuul.d/jobs.yaml
View File

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

4
zuul.d/project.yaml
View File

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