From e2340b7f04cec4c226eeb73c11bd103855a2c974 Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Sat, 16 Feb 2019 19:58:33 +0000
Subject: [PATCH] Revert "Avoid distro installing unused services"

The distro_install and service_install packages have got all
mixed up together. As a result source installs are dropping
openstack distro packages all over the place.

This reverts commit bae892d9badbca8d3a99e79ffeba71d21ed4b00b.

Change-Id: I4f0128e629abe2b16dc64d9f3d56032f2f358129
---
 vars/distro_install.yml | 12 ------------
 vars/redhat-7.yml       | 12 +++---------
 vars/suse.yml           | 14 +++-----------
 vars/ubuntu.yml         | 20 +++++++-------------
 4 files changed, 13 insertions(+), 45 deletions(-)

diff --git a/vars/distro_install.yml b/vars/distro_install.yml
index d2a326d7..3078c273 100644
--- a/vars/distro_install.yml
+++ b/vars/distro_install.yml
@@ -44,18 +44,6 @@ neutron_package_list: |-
   {% set _ = packages.extend(neutron_vpnaas_distro_packages) %}
   {% set _ = packages.extend(neutron_optional_vpnaas_distro_packages) %}
   {% endif %}
-  {% if neutron_services['neutron-server']['group'] in group_names %}
-  {%   set _ = packages.extend(neutron_server_distro_packages) %}
-  {% endif %}
-  {% if neutron_services['neutron-dhcp-agent']['group'] in group_names %}
-  {%   set _ = packages.extend(neutron_dhcp_agent_distro_packages) %}
-  {% endif %}
-  {% if neutron_services['neutron-l3-agent']['group'] in group_names %}
-  {%   set _ = packages.extend(neutron_l3_agent_distro_packages) %}
-  {% endif %}
-  {% if neutron_services['neutron-metering-agent']['group'] in group_names %}
-  {%   set _ = packages.extend(neutron_metering_agent_distro_packages) %}
-  {% endif %}
   {% if neutron_services['neutron-metadata-agent']['group'] in group_names %}
   {% set _ = packages.extend(neutron_metadata_agent_distro_packages) %}
   {% endif %}
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index b940df3b..2ceace2c 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -53,16 +53,10 @@ neutron_devel_distro_packages:
 neutron_service_distro_packages:
   - openstack-neutron
   - openstack-neutron-ml2
-  - python-memcached
-
-neutron_server_distro_packages: []
-
-neutron_dhcp_agent_distro_packages: []
-
-neutron_l3_agent_distro_packages: []
-
-neutron_metering_agent_distro_packages:
+  - openstack-neutron-macvtap-agent
   - openstack-neutron-metering-agent
+  - openstack-neutron-l2gw-agent
+  - python-memcached
 
 neutron_optional_ovs_distro_packages:
   - openstack-neutron-openvswitch
diff --git a/vars/suse.yml b/vars/suse.yml
index cc5e5e35..b6f1244a 100644
--- a/vars/suse.yml
+++ b/vars/suse.yml
@@ -68,20 +68,12 @@ neutron_devel_distro_packages:
 
 neutron_service_distro_packages:
   - openstack-neutron
-  - openstack-neutron-metadata-agent
-  - python-memcached
-
-neutron_server_distro_packages:
-  - openstack-neutron-server
-
-neutron_dhcp_agent_distro_packages:
   - openstack-neutron-dhcp-agent
-
-neutron_l3_agent_distro_packages:
   - openstack-neutron-l3-agent
-
-neutron_metering_agent_distro_packages:
+  - openstack-neutron-metadata-agent
   - openstack-neutron-metering-agent
+  - openstack-neutron-server
+  - python-memcached
 
 neutron_optional_ovs_distro_packages:
   - openstack-neutron-openvswitch-agent
diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml
index 81af4cb7..0821eb1f 100644
--- a/vars/ubuntu.yml
+++ b/vars/ubuntu.yml
@@ -64,21 +64,16 @@ neutron_devel_distro_packages:
   - python-httplib2
 
 neutron_service_distro_packages:
+  - neutron-server
+  - neutron-dhcp-agent
+  - neutron-l2gateway-agent
+  - neutron-l3-agent
+  - neutron-macvtap-agent
+  - neutron-metadata-agent
+  - neutron-metering-agent
   - neutron-plugin-ml2
   - python-memcache
 
-neutron_server_distro_packages:
-  - neutron-server
-
-neutron_dhcp_agent_distro_packages:
-  - neutron-dhcp-agent
-
-neutron_l3_agent_distro_packages:
-  - neutron-l3-agent
-
-neutron_metering_agent_distro_packages:
-  - neutron-metering-agent
-
 neutron_optional_ovs_distro_packages:
   - neutron-openvswitch-agent
 
@@ -107,7 +102,6 @@ neutron_vpnaas_distro_packages:
   - strongswan
 
 neutron_metadata_agent_distro_packages:
-  - neutron-metadata-agent
   - haproxy
 
 neutron_remove_distro_packages: