diff options
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']({ |