summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtools/conf/generate_sample.sh26
-rwxr-xr-xtools/config/check_uptodate.sh (renamed from tools/conf/check_uptodate.sh)0
-rw-r--r--tox.ini2
3 files changed, 1 insertions, 27 deletions
diff --git a/tools/conf/generate_sample.sh b/tools/conf/generate_sample.sh
deleted file mode 100755
index 6a491170e..000000000
--- a/tools/conf/generate_sample.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2012 SINA Corporation
-# All Rights Reserved.
-# Author: Zhongyue Luo <lzyeval@gmail.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-FILES=$(find heat -type f -name "*.py" ! -path "heat/tests/*" -exec \
- grep -l "Opt(" {} \; | sort -u)
-
-DEST=${1:-etc/heat/heat.conf.sample}
-
-PYTHONPATH=./:${PYTHONPATH} \
- python $(dirname "$0")/../../heat/openstack/common/config/generator.py ${FILES} > $DEST
diff --git a/tools/conf/check_uptodate.sh b/tools/config/check_uptodate.sh
index 96d77a97a..96d77a97a 100755
--- a/tools/conf/check_uptodate.sh
+++ b/tools/config/check_uptodate.sh
diff --git a/tox.ini b/tox.ini
index 8be29e891..20faec26c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,7 +19,7 @@ commands =
[testenv:pep8]
commands =
flake8 heat bin/heat-api bin/heat-api-cfn bin/heat-api-cloudwatch bin/heat-engine bin/heat-manage contrib
- {toxinidir}/tools/conf/check_uptodate.sh
+ {toxinidir}/tools/config/check_uptodate.sh
[testenv:venv]
commands = {posargs}