From 5fe35b0d7a4d2ea46e8170ae39ecc9a8d3aadc19 Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Wed, 28 Jun 2017 22:32:38 +0100
Subject: [PATCH] pip-and-virtualenv: Install python3 on openSUSE

The python3 package actually contains some core modules (like the xml
one) which are not present in the python3-base on which is pulled by
the python3-devel package. As such, it's best to have it installed
similar to python-xml for python2.

Change-Id: I5cd5d1127ae62d6753c2ace44965179c5400bb9a
---
 .../pip-and-virtualenv/package-installs.yaml       | 14 ++++++++++++--
 .../elements/pip-and-virtualenv/pkg-map            |  6 ++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/diskimage_builder/elements/pip-and-virtualenv/package-installs.yaml b/diskimage_builder/elements/pip-and-virtualenv/package-installs.yaml
index 6b62929c1..3f2179edd 100644
--- a/diskimage_builder/elements/pip-and-virtualenv/package-installs.yaml
+++ b/diskimage_builder/elements/pip-and-virtualenv/package-installs.yaml
@@ -1,8 +1,18 @@
-# This package is only valid for SUSE and we need to pull it in
-# early enough because pip depends on it.
+# The python-xml and python3 openSUSE packages contain core python modules
+# such as the XML one but the python devel packages do not pull them. As
+# such we need to install them during the pre-install.d phase so they are
+# available as early as possible. See
+# - https://bugzilla.suse.com/show_bug.cgi?id=1046990
+# - https://review.openstack.org/#/c/478648/
+# - https://review.openstack.org/#/c/478650/
+# for discussions about this issue.
 python-xml:
   phase: pre-install.d
   dib_python_version: 2
+python3:
+  phase: pre-install.d
+  installtype: package
+  dib_python_version: 3
 python-pip:
   installtype: package
   dib_python_version: 2
diff --git a/diskimage_builder/elements/pip-and-virtualenv/pkg-map b/diskimage_builder/elements/pip-and-virtualenv/pkg-map
index 8cfd5839b..0cfe54623 100644
--- a/diskimage_builder/elements/pip-and-virtualenv/pkg-map
+++ b/diskimage_builder/elements/pip-and-virtualenv/pkg-map
@@ -11,7 +11,8 @@
     "suse": {
       "python-xml": "python-xml",
       "python-dev": "python-devel",
-      "python3-dev": "python3-devel"
+      "python3-dev": "python3-devel",
+      "python3": "python3"
     },
     "redhat": {
       "python-dev": "python2-devel",
@@ -19,6 +20,7 @@
     }
   },
   "default": {
-    "python-xml": ""
+    "python-xml": "",
+    "python3": ""
   }
 }