Don't ever install python-pip and python-virtualenv on RHOS 6. For the

undercloud install, we can just blacklist the element in the json file. For
image builds, we need to instead use an override element that doesn't install
anything.

elements/pip-and-virtualenv-override/README.md

@@ -0,0 +1,4 @@
+This element will override the behavior from the pip-and-virtualenv element
+from tripleo-image-elements so that python-pip and python-virtualenv are never
+installed.
+

elements/pip-and-virtualenv-override/element-provides

@@ -0,0 +1 @@
+pip-and-virtualenv

elements/undercloud-install/pre-install.d/01-pbr

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -eux
-
-install-packages python-pbr

json-files/rhel-7-rhos-6-undercloud-packages.json

@@ -56,7 +56,8 @@
     ],
     "exclude-element": [
       "dkms",
-      "openvswitch-datapath"
+      "openvswitch-datapath",
+      "pip-and-virtualenv"
     ],
     "blacklist": [
       "10-cloud-init",

scripts/instack-build-images

@@ -54,7 +54,7 @@ fi
 
 export PACKAGES=${PACKAGES:-"1"}
 if [ "$PACKAGES" = "1" ]; then
-    export DIB_COMMON_ELEMENTS="$DIB_COMMON_ELEMENTS tripleo-image-elements undercloud-package-install"
+    export DIB_COMMON_ELEMENTS="$DIB_COMMON_ELEMENTS tripleo-image-elements undercloud-package-install pip-and-virtualenv-override"
 fi
 
 export OVERCLOUD_CONTROL_DIB_EXTRA_ARGS=${OVERCLOUD_CONTROL_DIB_EXTRA_ARGS:-"\

scripts/instack-install-undercloud

@@ -17,9 +17,9 @@ else
 fi
 
 export ELEMENTS_PATH=${ELEMENTS_PATH:-"\
+/usr/share/instack-undercloud:\
 /usr/share/tripleo-image-elements:\
-/usr/share/diskimage-builder/elements:\
-/usr/share/instack-undercloud"}
+/usr/share/diskimage-builder/elements"}
 
 echo "Sourcing answers file from instack.answers..."
 source ~/instack.answers