From 80c12b266e38151c563787dcec3a6a22d813fb06 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <jxharlow@godaddy.com>
Date: Tue, 19 Apr 2016 17:42:23 -0700
Subject: [PATCH] Drop bootstrap support for any variation of RHEL 6.x

Change-Id: I838995aab93118561e2a29790fb4b2156b205ad5
---
 tools/bootstrap/CentOS                      | 6 +++---
 tools/bootstrap/CommonRedHat                | 9 ++++-----
 tools/bootstrap/OracleLinuxServer           | 6 +++---
 tools/bootstrap/RedHatEnterpriseLinuxServer | 6 +++---
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/tools/bootstrap/CentOS b/tools/bootstrap/CentOS
index 6d474f02..56f47366 100644
--- a/tools/bootstrap/CentOS
+++ b/tools/bootstrap/CentOS
@@ -1,8 +1,8 @@
 # -*- sh -*-
 
-## Bootstrap for CentOS Linux 6.0 <-> 7.1.9999
+## Bootstrap for CentOS Linux 7.0 <-> 7.999.9999
 SHORTNAME=CENTOS
-MAX_RELEASE=7.1.9999
-MIN_RELEASE=6.0
+MAX_RELEASE=7.999.9999
+MIN_RELEASE=7.0
 
 source "$BSCONF_DIR/CommonRedHat"
diff --git a/tools/bootstrap/CommonRedHat b/tools/bootstrap/CommonRedHat
index afa1f5df..6730fe3d 100644
--- a/tools/bootstrap/CommonRedHat
+++ b/tools/bootstrap/CommonRedHat
@@ -2,11 +2,10 @@
 
 STEPS="selinux epel repos rpm_packages virtualenv"
 REPO_DIR=/etc/yum.repos.d/
-if [ "$MAJOR_RELEASE" = "6" ]; then
-    EPEL_RPM_URL="http://mirrors.kernel.org/fedora-epel/6/i386/epel-release-6-8.noarch.rpm"
-elif [ "$MAJOR_RELEASE" = "7" ]; then
-    EPEL_RPM_URL="http://mirrors.kernel.org/fedora-epel/7/x86_64/e/epel-release-7-5.noarch.rpm"
-fi
+
+# TODO(harlowja): make this more automatically findable, since it does
+# see to change at some frequency...
+EPEL_RPM_URL="http://mirrors.kernel.org/fedora-epel/7/x86_64/e/epel-release-7-6.noarch.rpm"
 
 # Ensure anvil python gets access to this...
 VENV_CMD="virtualenv"
diff --git a/tools/bootstrap/OracleLinuxServer b/tools/bootstrap/OracleLinuxServer
index 919de2e4..f6b31c39 100644
--- a/tools/bootstrap/OracleLinuxServer
+++ b/tools/bootstrap/OracleLinuxServer
@@ -1,8 +1,8 @@
 # -*- sh -*-
 
-## Bootstrap OEL 6.3 <-> 7.0 for Openstack Anvil
+## Bootstrap OEL 6.3 <-> 7.999.9999 for Openstack Anvil
 SHORTNAME=OEL
-MIN_RELEASE=6.3
-MAX_RELEASE=7.0
+MIN_RELEASE=7.0
+MAX_RELEASE=7.999.9999
 
 source "$BSCONF_DIR/CommonRedHat"
diff --git a/tools/bootstrap/RedHatEnterpriseLinuxServer b/tools/bootstrap/RedHatEnterpriseLinuxServer
index 53f6b126..b580d5f4 100644
--- a/tools/bootstrap/RedHatEnterpriseLinuxServer
+++ b/tools/bootstrap/RedHatEnterpriseLinuxServer
@@ -1,8 +1,8 @@
 # -*- sh -*-
 
-## Bootstrap for Redhat Enterprise Linux 6.0 <-> 7.1.9999
+## Bootstrap for Redhat Enterprise Linux 7.0 <-> 7.999.9999
 SHORTNAME=RHEL
-MAX_RELEASE=7.1.9999
-MIN_RELEASE=6.0
+MAX_RELEASE=7.999.9999
+MIN_RELEASE=7.0
 
 source "$BSCONF_DIR/CommonRedHat"