diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2019-12-03 16:01:42 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2019-12-19 10:20:28 +0000 |
| commit | 34d8df8686883ca62876ce85a0ad1fc8e6513f6e (patch) | |
| tree | f4c449613090a2fa4ff0a0d3460946410dd343bb /mcp/patches | |
| parent | d8f0a6b4fd9c3cb10780abcbd9b446c48b08cced (diff) | |
[fdio] Bump VPP to 19.08.1-release
- refresh formula patches with new package names where necessary;
- switch to packagecloud.io repositories;
Change-Id: I1178a387891d34117c162380d8247eb7a4212359
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 6203ecc1513994063a5f7916999657f528a37385)
Diffstat (limited to 'mcp/patches')
| -rw-r--r-- | mcp/patches/salt-formula-linux/0002-network-Bring-in-basic-VPP-support.patch | 5 | ||||
| -rw-r--r-- | mcp/patches/salt-formula-neutron/0001-Bring-in-basic-VPP-support.patch | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mcp/patches/salt-formula-linux/0002-network-Bring-in-basic-VPP-support.patch b/mcp/patches/salt-formula-linux/0002-network-Bring-in-basic-VPP-support.patch index 6c26ae864..5166be56a 100644 --- a/mcp/patches/salt-formula-linux/0002-network-Bring-in-basic-VPP-support.patch +++ b/mcp/patches/salt-formula-linux/0002-network-Bring-in-basic-VPP-support.patch @@ -91,7 +91,7 @@ diff --git a/linux/network/dpdk.sls b/linux/network/dpdk.sls index 786f7c8..09453c6 100644 --- a/linux/network/dpdk.sls +++ b/linux/network/dpdk.sls -@@ -32,6 +32,44 @@ linux_network_dpdk_service: +@@ -32,6 +32,45 @@ linux_network_dpdk_service: - watch: - file: /etc/dpdk/interfaces @@ -101,7 +101,8 @@ index 786f7c8..09453c6 100644 + pkg.installed: + - pkgs: + - vpp -+ - vpp-plugins ++ - vpp-plugin-core ++ - vpp-plugin-dpdk + - bridge-utils + +/etc/vpp/commands.txt: diff --git a/mcp/patches/salt-formula-neutron/0001-Bring-in-basic-VPP-support.patch b/mcp/patches/salt-formula-neutron/0001-Bring-in-basic-VPP-support.patch index 87f79f742..d790ede3d 100644 --- a/mcp/patches/salt-formula-neutron/0001-Bring-in-basic-VPP-support.patch +++ b/mcp/patches/salt-formula-neutron/0001-Bring-in-basic-VPP-support.patch @@ -187,7 +187,7 @@ index 9e6cb36..17cd5b3 100644 {%- do server_services_list.append('neutron-rpc-server') if wsgi_enabled %} +{%- if 'vpp' in pillar.neutron.get('server', {}).get('backend', {}).get('mechanism', []) %} -+{%- do server_pkgs_list.extend(['python-networking-vpp']) %} ++{%- do server_pkgs_list.extend(['python3-networking-vpp']) %} +{%- endif %} + {% set server = salt['grains.filter_by']({ |