openstack
/
openstack-ansible-os_neutron
Code Issues Proposed changes

Merge "Change Calico package to Felix"

This commit is contained in:
Jenkins 2016-11-07 04:15:11 +00:00 committed by Gerrit Code Review
parent 69e710b72a 2d248adcc5
commit ecb0152f2c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
defaults/main.yml
View File

@ -37,7 +37,6 @@ neutron_dynamic_routing_git_repo: https://git.openstack.org/openstack/neutron-dy
neutron_dynamic_routing_git_install_branch: master
calico_git_repo: https://github.com/projectcalico/felix
calico_git_package_name: calico
calico_git_install_branch: master
networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico
@ -50,7 +49,7 @@ neutron_developer_constraints:
- "git+{{ neutron_lbaas_git_repo }}@{{ neutron_lbaas_git_install_branch }}#egg=neutron-lbaas"
- "git+{{ neutron_vpnaas_git_repo }}@{{ neutron_vpnaas_git_install_branch }}#egg=neutron-vpnaas"
- "git+{{ neutron_dynamic_routing_git_repo }}@{{ neutron_dynamic_routing_git_install_branch }}#egg=neutron-dynamic-routing"
- "git+{{ calico_git_repo }}@{{ calico_git_install_branch }}#egg=calico"
- "git+{{ calico_git_repo }}@{{ calico_git_install_branch }}#egg=felix"
- "git+{{ networking_calico_git_repo }}@{{ networking_calico_git_install_branch }}#egg=networking-calico"
# Name of the virtual env to deploy into
@ -509,7 +508,7 @@ neutron_pip_packages:
- repoze.lru
neutron_optional_calico_pip_packages:
- calico
- felix
- networking-calico
- python-etcd