From 7603f97cadbf92c79549547dabbe252650343cac Mon Sep 17 00:00:00 2001
From: Gregory Haynes <greg@greghaynes.net>
Date: Wed, 21 Dec 2016 17:39:27 +0000
Subject: [PATCH] Revert "Revert Xenial to Python 2"

We landed the fix for this in
Icdb769541eee9793f261b4b8ec563be76ee13fe2.

This reverts commit 2978ff885b1084fee923be7efcac3524d6ee2b56.

Change-Id: Iecfc41ab2aad57bc4f6f86a13810b534d19a8fd5
---
 .../dib-python/environment.d/50-dib-python-version     |  2 --
 elements/ubuntu/pre-install.d/00-install-python        | 10 ----------
 2 files changed, 12 deletions(-)
 delete mode 100755 elements/ubuntu/pre-install.d/00-install-python

diff --git a/elements/dib-python/environment.d/50-dib-python-version b/elements/dib-python/environment.d/50-dib-python-version
index 783126e83..58a5dc7a9 100644
--- a/elements/dib-python/environment.d/50-dib-python-version
+++ b/elements/dib-python/environment.d/50-dib-python-version
@@ -5,8 +5,6 @@ if [ -z "${DIB_PYTHON_VERSION:-}" ]; then
             DIB_PYTHON_VERSION=2
         elif [ "$DIB_RELEASE" == "trusty" ]; then
             DIB_PYTHON_VERSION=2
-        elif [ "$DIB_RELEASE" == "xenial" ]; then
-	    DIB_PYTHON_VERSION=2
         fi
     elif [ "$DISTRO_NAME" == "debian" ]; then
         DIB_PYTHON_VERSION=2
diff --git a/elements/ubuntu/pre-install.d/00-install-python b/elements/ubuntu/pre-install.d/00-install-python
deleted file mode 100755
index 19ae8f66e..000000000
--- a/elements/ubuntu/pre-install.d/00-install-python
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
-    set -x
-fi
-set -eu
-set -o pipefail
-
-# hack to get python into Xenial python3 only images, while we
-# work-around issues.
-apt-get -y install python || true