1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
2 : Copyright (c) 2019 Mirantis Inc., Enea AB and others.
4 : All rights reserved. This program and the accompanying materials
5 : are made available under the terms of the Apache License, Version 2.0
6 : which accompanies this distribution, and is available at
7 : http://www.apache.org/licenses/LICENSE-2.0
8 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
9 From: Michael Polenchuk <mpolenchuk@mirantis.com>
10 Date: Thu, 11 Jul 2019 11:52:53 +0400
11 Subject: [PATCH] Align packages with stein reqs
13 diff --git a/neutron/map.jinja b/neutron/map.jinja
14 index 17cd5b3..ed1831a 100644
15 --- a/neutron/map.jinja
16 +++ b/neutron/map.jinja
18 {%- if os_family == "Debian" %}
19 {%- set compute_pkgs_ovn = ['ovn-common', 'ovn-host'] %}
20 {%- if pillar.neutron.compute is defined and pillar.neutron.compute.metadata is defined %}
21 -{%- do compute_pkgs_ovn.extend(['neutron-common', 'python-networking-ovn', 'haproxy']) %}
22 +{%- do compute_pkgs_ovn.extend(['neutron-common', 'python3-networking-ovn', 'haproxy']) %}
24 {%- set linuxbridge_enabled = pillar.neutron.compute is defined and pillar.neutron.compute.get('backend', {}).get('mechanism', {}).get('lb', {}).get('driver', {}) == "linuxbridge" %}
25 {%- set vpp_enabled = 'vpp' in pillar.neutron.get('compute', {}).get('backend', {}).get('mechanism', []) %}
27 {%- set pkgs_cmp = ['vpp-agent'] %}
28 {%- set services_cmp = ['vpp-agent'] %}
30 -{%- set pkgs_cmp = ['neutron-openvswitch-agent', 'python-pycadf'] %}
31 +{%- set pkgs_cmp = ['neutron-openvswitch-agent'] %}
32 {%- set services_cmp = ['neutron-openvswitch-agent'] %}
38 'pkgs_ovn': compute_pkgs_ovn,
39 - 'pkgs_bagpipe': ['python-networking-bagpipe'],
40 + 'pkgs_bagpipe': ['python3-networking-bagpipe'],
41 'services': services_cmp,
42 'services_ovn': ['ovn-host'],
46 {%- set sfc_enabled = pillar.neutron.get('server', {}).get('sfc', {}).get('enabled', False) %}
47 {%- set wsgi_enabled = pillar.neutron.get('server', {}).get('wsgi', {}).get('enabled', False) %}
48 -{%- set server_pkgs_list = ['python-neutron-lbaas'] %}
49 +{%- set server_pkgs_list = [] %}
50 {%- do server_pkgs_list.append('uwsgi-plugin-python' if wsgi_enabled else 'neutron-server') %}
51 -{%- do server_pkgs_list.append('python-networking-sfc') if sfc_enabled %}
52 +{%- do server_pkgs_list.append('python3-networking-sfc') if sfc_enabled %}
53 {%- set server_services_list = ['neutron-server'] %}
54 {%- do server_services_list.append('neutron-rpc-server') if wsgi_enabled %}
57 'BaseDefaults': default_params,
59 'pkgs': server_pkgs_list,
60 - 'pkgs_ovn': ['python-networking-ovn', 'ovn-common', 'ovn-central'],
61 + 'pkgs_ovn': ['python3-networking-ovn', 'ovn-common', 'ovn-central'],
62 'pkgs_ml2': ['neutron-plugin-ml2'],
63 - 'pkgs_l2gw': ['python-networking-l2gw'],
64 - 'pkgs_bgpvpn': ['python-networking-bgpvpn'],
65 - 'pkgs_bagpipe': ['python-networking-bagpipe'],
66 + 'pkgs_l2gw': ['python3-networking-l2gw'],
67 + 'pkgs_bgpvpn': ['python3-networking-bgpvpn'],
68 + 'pkgs_bagpipe': ['python3-networking-bagpipe'],
69 'services': server_services_list,
70 'services_ovn': ['openvswitch-switch', 'ovn-central'],
74 {% set client = salt['grains.filter_by']({
76 - 'pkgs': ['python-neutronclient'],
77 + 'pkgs': ['python3-neutronclient'],
81 diff --git a/neutron/opendaylight/client.sls b/neutron/opendaylight/client.sls
82 index fb5829f..be9aff6 100644
83 --- a/neutron/opendaylight/client.sls
84 +++ b/neutron/opendaylight/client.sls
86 {%- from "neutron/map.jinja" import compute as neutron with context %}
89 -python-networking-odl:
90 +python3-networking-odl:
93 {%- if not grains.get('noservices', False) %}
94 @@ -31,6 +31,6 @@ neutron_odl_ovs_hostconfig:
96 - name: 'neutron-odl-ovs-hostconfig {{ ovs_hostconfig|join(' ') }}'
98 - - pkg: python-networking-odl
99 + - pkg: python3-networking-odl
102 diff --git a/neutron/server.sls b/neutron/server.sls
103 index 99bbdef..692e0ce 100644
104 --- a/neutron/server.sls
105 +++ b/neutron/server.sls
106 @@ -115,7 +115,7 @@ ml2_plugin_link:
109 {%- if server.backend.get('opendaylight', False) %}
110 -python-networking-odl:
111 +python3-networking-odl:
114 - pkg: neutron_server_packages