From 57028862f277380d6f876235ba6a25052fd3be80 Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Mon, 11 Jun 2018 10:40:06 +0100
Subject: [PATCH] Revert "vars: Do not install devel packages by default"

This reverts commit b467764f15f1fb06c9c43813095ebb08d0d28754.

The various os_* roles are missing many build dependencies so dropping
these from the containers results to build failures everywhere. It's
best to do that when all the roles are fixed to contain the build
dependencies they need.

Change-Id: If7e2e732103ed516b9bb73d06c413328c08b93be
---
 vars/redhat-7-host.yml     | 6 +++++-
 vars/redhat-7.yml          | 3 +++
 vars/suse-42-host.yml      | 1 +
 vars/suse-42.yml           | 3 +++
 vars/ubuntu-16.04-host.yml | 2 ++
 vars/ubuntu-16.04.yml      | 4 ++++
 vars/ubuntu-18.04-host.yml | 2 ++
 vars/ubuntu-18.04.yml      | 4 ++++
 8 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/vars/redhat-7-host.yml b/vars/redhat-7-host.yml
index 19087599..01dfc1b0 100644
--- a/vars/redhat-7-host.yml
+++ b/vars/redhat-7-host.yml
@@ -27,10 +27,14 @@ lxc_hosts_distro_packages:
   - git
   - libseccomp
   - libselinux
+  - libselinux-devel
   - lxc
+  - lxc-devel
+  - lxc-libs
   - lxc-templates
+  - policycoreutils-python
   - python2-lxc
-  - selinux-policy-devel # needed to compile selinux module
+  - selinux-policy-devel
   - unzip
   - xz
 
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index 1869356d..3cfc977e 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -38,10 +38,13 @@ _lxc_cache_distro_packages:
   - gcc
   - iproute
   - iputils
+  - libffi-devel
   - openssh-server
   - openssl
+  - openssl-devel
   - policycoreutils
   - python2
+  - python-devel
   - rsync
   - setup
   - sudo
diff --git a/vars/suse-42-host.yml b/vars/suse-42-host.yml
index 1e39f8d8..39d5049e 100644
--- a/vars/suse-42-host.yml
+++ b/vars/suse-42-host.yml
@@ -34,6 +34,7 @@ lxc_hosts_distro_packages:
   - git-core
   - libseccomp2
   - lxc
+  - liblxc-devel
   - python-lxc-python2
   - xz
 
diff --git a/vars/suse-42.yml b/vars/suse-42.yml
index 00bceaa7..24d333a3 100644
--- a/vars/suse-42.yml
+++ b/vars/suse-42.yml
@@ -40,10 +40,13 @@ _lxc_cache_distro_packages:
   - gcc
   - iproute2
   - iputils
+  - libffi-devel
+  - libopenssl-devel
   - netcfg
   - openssh
   - openssl
   - python
+  - python-devel
   - python-xml
   - rsync
   - sudo
diff --git a/vars/ubuntu-16.04-host.yml b/vars/ubuntu-16.04-host.yml
index 689b7f27..ed38ab40 100644
--- a/vars/ubuntu-16.04-host.yml
+++ b/vars/ubuntu-16.04-host.yml
@@ -35,7 +35,9 @@ lxc_hosts_distro_packages:
   - language-pack-en
   - liblxc1
   - lxc
+  - lxc-dev
   - lxc-templates
+  - python-dev
   - python-lxc
   - python3-lxc
   - systemd-container
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index 7bc4ce41..18581397 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -39,11 +39,15 @@ _lxc_cache_distro_packages:
   - gcc
   - iproute2
   - iputils-ping
+  - libffi-dev
+  - libssl-dev
   - locales
   - netbase
   - openssh-server
   - openssl
   - python2.7
+  - python-dev
+  - python3-dev
   - rsync
   - sudo
   - systemd
diff --git a/vars/ubuntu-18.04-host.yml b/vars/ubuntu-18.04-host.yml
index a5d6eaa9..64e030f3 100644
--- a/vars/ubuntu-18.04-host.yml
+++ b/vars/ubuntu-18.04-host.yml
@@ -35,7 +35,9 @@ lxc_hosts_distro_packages:
   - language-pack-en
   - liblxc1
   - lxc
+  - lxc-dev
   - lxc-templates
+  - python-dev
   - python-lxc
   - python3-lxc
   - systemd-container
diff --git a/vars/ubuntu-18.04.yml b/vars/ubuntu-18.04.yml
index e3988c6c..1d82703e 100644
--- a/vars/ubuntu-18.04.yml
+++ b/vars/ubuntu-18.04.yml
@@ -39,11 +39,15 @@ _lxc_cache_distro_packages:
   - gcc
   - iproute2
   - iputils-ping
+  - libffi-dev
+  - libssl-dev
   - locales
   - netbase
   - openssh-server
   - openssl
   - python2.7
+  - python-dev
+  - python3-dev
   - rsync
   - sudo
   - systemd