From 791b166a1280a142369abca889bfea46168fa50d Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Fri, 1 Jun 2018 10:59:05 +0100
Subject: [PATCH] vars: Do not pull devel packages on distro installations

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

Implements: blueprint openstack-distribution-packages
Change-Id: Id1d30da7dbca35b5a44215a78110971bda6a4263
---
 vars/redhat-7.yml       | 10 +++++-----
 vars/source_install.yml |  1 +
 vars/suse-42.yml        | 10 +++++-----
 vars/ubuntu-16.04.yml   |  8 +++++---
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index 21ad9e77..11d675ad 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -17,17 +17,17 @@ keystone_distro_packages:
   - ca-certificates
   - cronie
   - cronie-anacron
-  - cyrus-sasl-lib
   - git
+  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
+  - rsync
+
+keystone_devel_distro_packages:
+  - cyrus-sasl-lib
   - libffi-devel
   - libxml2-devel
   - libxslt-devel
-  - openldap
   - openldap-devel
-  - openssl
   - python-devel
-  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
-  - rsync
   - which
 
 keystone_service_distro_packages:
diff --git a/vars/source_install.yml b/vars/source_install.yml
index 77c6ca0e..b9a8584d 100644
--- a/vars/source_install.yml
+++ b/vars/source_install.yml
@@ -34,6 +34,7 @@ keystone_package_list: |-
   {% if keystone_developer_mode | bool %}
   {%   set _ = packages.extend(keystone_developer_mode_distro_packages) %}
   {% endif %}
+  {% set _ = packages.extend(keystone_devel_distro_packages) %}
   {{ packages }}
 
 _keystone_bin: "/openstack/venvs/keystone-{{ keystone_venv_tag }}/bin"
diff --git a/vars/suse-42.yml b/vars/suse-42.yml
index 84ac2212..d7d2f6fa 100644
--- a/vars/suse-42.yml
+++ b/vars/suse-42.yml
@@ -17,17 +17,17 @@
 keystone_distro_packages:
   - ca-certificates
   - cronie
-  - cyrus-sasl-devel
   - git-core
+  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
+  - rsync
+
+keystone_devel_distro_packages:
+  - cyrus-sasl-devel
   - libffi-devel
   - libxml2-devel
   - libxslt-devel
-  - openldap2
   - openldap2-devel
-  - openssl
   - python-devel
-  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
-  - rsync
   - which
 
 keystone_service_distro_packages:
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index e995c45b..aecc3c4e 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -14,8 +14,12 @@
 # limitations under the License.
 
 keystone_distro_packages:
-  - docutils-common
   - git
+  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
+  - rsync
+
+keystone_devel_distro_packages:
+  - docutils-common
   - libffi-dev
   - libjs-sphinxdoc
   - libjs-underscore
@@ -25,8 +29,6 @@ keystone_distro_packages:
   - libxslt1-dev
   - libxml2-dev
   - python-dev
-  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
-  - rsync
 
 keystone_service_distro_packages:
   - keystone