openstack
/
openstack-ansible-os_neutron
Code Issues Proposed changes

Return calico to voting 

Since we did manual bump of calico version, it shouldn't fail anymore.

Depends-On: https://review.opendev.org/762985
Change-Id: I4414a6ea579dcff52857d7296c31f5a827ee515f
This commit is contained in:
Dmitriy Rabotyagov 2020-01-15 14:31:36 +02:00 committed by Dmitriy Rabotyagov
parent 6b39e9c85b
commit 27cb834695
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml
View File

@ -57,7 +57,7 @@ neutron_vpnaas_git_repo: https://opendev.org/openstack/neutron-vpnaas
neutron_vpnaas_git_install_branch: master
neutron_dynamic_routing_git_repo: https://opendev.org/openstack/neutron-dynamic-routing
neutron_dynamic_routing_git_install_branch: master
networking_calico_git_repo: https://opendev.org/openstack/networking-calico
networking_calico_git_repo: https://github.com/projectcalico/networking-calico
networking_calico_git_install_branch: master
networking_odl_git_repo: https://opendev.org/openstack/networking-odl
networking_odl_git_install_branch: master

1
vars/main.yml
View File

@ -51,6 +51,7 @@ neutron_optional_bgp_pip_packages:
neutron_optional_calico_pip_packages:
- networking-calico
- python-etcd
- etcd3gw
neutron_optional_vpnaas_pip_packages:
- neutron_vpnaas

6
zuul.d/project.yaml
View File

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