Update Calico Felix to v3

Moving to v3 requires etcd3, which uses a new L4 gatewayvsetup and
deprecates v2 proxy. The role configuration is updated to use the
etcd3 L4 gateway.

Change-Id: I91d3fef8d1b89f595b529c7c96b3d7249e5b7291
This commit is contained in:
Logan V 2018-11-07 21:50:13 -06:00
parent b1f4269ecc
commit 55eae66644
3 changed files with 6 additions and 4 deletions

View File

@ -472,9 +472,9 @@ neutron_vpnaas_service_provider: VPN:strongswan:neutron_vpnaas.services.vpn.serv
neutron_management_ip: 127.0.0.1 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" calico_felix_url: "https://github.com/projectcalico/felix/releases/download/{{ calico_felix_version }}/calico-felix-amd64"
calico_felix_version: 2.3.0 calico_felix_version: v3.5.2
calico_felix_sha256: 6cc538d6d93d2b5e732841769f427ce61a4e7d9a6eedf4ca8d33c4df42cf6419 calico_felix_sha256: f7901c1b9e41c74c36b0ba2119c42c02ac6227af505f5bc571cee29e37b1550a
calico_felix_validate_certs: yes calico_felix_validate_certs: yes
# OVN Defaults # OVN Defaults

View File

@ -25,7 +25,7 @@
include_role: include_role:
name: etcd name: etcd
vars: vars:
etcd_install_type: proxy etcd_install_type: gateway
when: when:
- "neutron_plugin_type in ['ml2.calico']" - "neutron_plugin_type in ['ml2.calico']"
- "group_names | intersect([ - "group_names | intersect([

View File

@ -2,3 +2,5 @@
[global] [global]
MetadataAddr = {{ internal_lb_vip_address }} MetadataAddr = {{ internal_lb_vip_address }}
EtcdEndpoints = http://127.0.0.1:2379
DatastoreType = etcdv3