From b4a047791d96512a5cd49e87d3e043c7eb3a0cf2 Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Tue, 23 Oct 2018 14:58:44 +0100
Subject: [PATCH] vars: Do not pull devel packages on distro installations

The devel packages are only needed to build the pip packages so we don't
need them when we install packages straight from the distro repos.

Change-Id: I08c6206dd83551e50a5b594cf428ffb8b2e8ebd8
Depends-On: https://review.openstack.org/612673
Depends-On: https://review.openstack.org/612661
---
 vars/debian.yml         |  8 +++++---
 vars/redhat-7.yml       | 14 ++++++++------
 vars/source_install.yml |  2 +-
 vars/suse.yml           | 14 ++++++++------
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/vars/debian.yml b/vars/debian.yml
index f944958b..324ca3f6 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -17,14 +17,16 @@ cache_timeout: 600
 
 swift_distro_packages:
   - curl
-  - gcc
   - git-core
+  - openssh-server
+  - rsync
+
+swift_devel_distro_packages:
+  - gcc
   - liberasurecode1
   - liberasurecode-dev
   - libffi-dev
-  - openssh-server
   - python-dev
-  - rsync
   - libssl-dev
 
 swift_service_distro_packages:
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index b6eb2d76..d4ea7935 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -15,19 +15,21 @@
 
 swift_distro_packages:
   - curl
-  - gcc
   - git
-  - liberasurecode
-  - liberasurecode-devel
-  - libffi-devel
   - openssh-server
-  - python-devel
   - rsync
-  - openssl-devel
   - cronie
   - cronie-anacron
   - which
 
+swift_devel_distro_packages:
+  - gcc
+  - liberasurecode
+  - liberasurecode-devel
+  - libffi-devel
+  - python-devel
+  - openssl-devel
+
 swift_service_distro_packages:
   - openstack-swift
   - python-keystonemiddleware
diff --git a/vars/source_install.yml b/vars/source_install.yml
index ac48e245..d50a5717 100644
--- a/vars/source_install.yml
+++ b/vars/source_install.yml
@@ -13,5 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-swift_package_list: "{{ swift_distro_packages }}"
+swift_package_list: "{{ swift_distro_packages + swift_devel_distro_packages }}"
 _swift_bin: "/openstack/venvs/swift-{{ swift_venv_tag }}/bin"
diff --git a/vars/suse.yml b/vars/suse.yml
index 9f54470e..1a89b936 100644
--- a/vars/suse.yml
+++ b/vars/suse.yml
@@ -16,19 +16,21 @@
 
 swift_distro_packages:
   - curl
-  - gcc
   - git-core
-  - liberasurecode1
-  - liberasurecode-devel
-  - libffi-devel
   - openssh
-  - python-devel
   - rsync
-  - libopenssl-devel
   - cronie
   - cronie-anacron
   - which
 
+swift_devel_distro_packages:
+  - gcc
+  - liberasurecode1
+  - liberasurecode-devel
+  - libffi-devel
+  - python-devel
+  - libopenssl-devel
+
 swift_service_distro_packages:
   - openstack-swift
   - openstack-swift-account