From 99768809f49e2658dc1d552dafd6f1b659bbb205 Mon Sep 17 00:00:00 2001
From: Steven Hardy <shardy@redhat.com>
Date: Wed, 3 Dec 2014 20:34:09 +0000
Subject: [PATCH] Remove config check_uptodate test

Our gate is currently broken due to an oslo library release,
so remove this check while we move to removing the sample config
(which requires changes to devstack to use tox -egenconfig)

Change-Id: Id4a37e9a5be156fea05c96e385c23da016ea9e69
---
 tools/config/check_uptodate.sh | 29 -----------------------------
 tox.ini                        |  1 -
 2 files changed, 30 deletions(-)
 delete mode 100755 tools/config/check_uptodate.sh

diff --git a/tools/config/check_uptodate.sh b/tools/config/check_uptodate.sh
deleted file mode 100755
index 585dcf6bd..000000000
--- a/tools/config/check_uptodate.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-PROJECT_NAME=${PROJECT_NAME:-heat}
-CFGFILE_NAME=${PROJECT_NAME}.conf.sample
-
-if [ -e etc/${PROJECT_NAME}/${CFGFILE_NAME} ]; then
-    CFGFILE=etc/${PROJECT_NAME}/${CFGFILE_NAME}
-elif [ -e etc/${CFGFILE_NAME} ]; then
-    CFGFILE=etc/${CFGFILE_NAME}
-else
-    echo "${0##*/}: can not find config file"
-    exit 1
-fi
-
-TEMPDIR=`mktemp -d /tmp/${PROJECT_NAME}.XXXXXX`
-trap "rm -rf $TEMPDIR" EXIT
-
-tools/config/generate_sample.sh -b ./ -p ${PROJECT_NAME} -o ${TEMPDIR}
-if [ $? != 0 ]
-then
-    exit 1
-fi
-
-if ! diff -u ${TEMPDIR}/${CFGFILE_NAME} ${CFGFILE}
-then
-   echo "${0##*/}: ${PROJECT_NAME}.conf.sample is not up to date."
-   echo "${0##*/}: Please run ${0%%${0##*/}}generate_sample.sh."
-   exit 1
-fi
diff --git a/tox.ini b/tox.ini
index e51663880..ab7e5fdfe 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,7 +24,6 @@ commands =
 [testenv:pep8]
 commands =
     flake8 heat bin/heat-api bin/heat-api-cfn bin/heat-api-cloudwatch bin/heat-engine bin/heat-manage contrib heat_integrationtests
-    {toxinidir}/tools/config/check_uptodate.sh
     # Check that .po and .pot files are valid:
     bash -c "find heat -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null"