From ea75a8ea103bfce8a66c88a50e8cee0808f04efa Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Mon, 4 Jun 2018 10:36:33 +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.

Change-Id: I97855f8ac677dc34d7e4619b4ec72aa593eca76f
Implements: blueprint openstack-distribution-packages
---
 vars/distro_install.yml | 2 +-
 vars/redhat-7.yml       | 4 +++-
 vars/source_install.yml | 2 +-
 vars/suse-42.yml        | 4 +++-
 vars/ubuntu-16.04.yml   | 4 +++-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/vars/distro_install.yml b/vars/distro_install.yml
index 44187d0c..8c23463f 100644
--- a/vars/distro_install.yml
+++ b/vars/distro_install.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-glance_package_list: "{{ glance_service_distro_packages }}"
+glance_package_list: "{{ glance_distro_packages + glance_service_distro_packages }}"
 
 _glance_bin: "/usr/bin"
 _glance_etc: "/etc"
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index 8d5725d4..690b5d85 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -15,11 +15,13 @@
 
 glance_distro_packages:
   - git
-  - libxml2-devel
   - nfs-utils
   - python-keystoneclient # Keystoneclient needed to OSA keystone lib
   - rpcbind
 
+glance_devel_distro_packages:
+  - libxml2-devel
+
 glance_service_distro_packages:
   - openstack-glance
   - uwsgi
diff --git a/vars/source_install.yml b/vars/source_install.yml
index 6d908eae..5626af77 100644
--- a/vars/source_install.yml
+++ b/vars/source_install.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-glance_package_list: "{{ glance_distro_packages }}"
+glance_package_list: "{{ glance_distro_packages + glance_devel_distro_packages }}"
 
 _glance_bin: "/openstack/venvs/glance-{{ glance_venv_tag }}/bin"
 _glance_etc: "{{ _glance_bin | dirname + '/etc' }}"
diff --git a/vars/suse-42.yml b/vars/suse-42.yml
index 2c03659e..b120e11e 100644
--- a/vars/suse-42.yml
+++ b/vars/suse-42.yml
@@ -16,11 +16,13 @@
 
 glance_distro_packages:
   - git-core
-  - libxml2-devel
   - nfs-utils
   - python-keystoneclient # Keystoneclient needed to OSA keystone lib
   - rpcbind
 
+glance_devel_distro_packages:
+  - libxml2-devel
+
 glance_service_distro_packages:
   - openstack-glance
   - openstack-glance-api
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index 337e14f3..8c02a473 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -19,11 +19,13 @@ cache_timeout: 600
 # Common apt packages
 glance_distro_packages:
   - git
-  - libxml2-dev
   - nfs-common
   - python-keystoneclient # Keystoneclient needed to OSA keystone lib
   - rpcbind
 
+glance_devel_distro_packages:
+  - libxml2-dev
+
 glance_service_distro_packages:
   - glance
   - glance-api