From 33d8d32381f60b6ff1973383dd87884b84be614e Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Fri, 7 Aug 2015 20:13:05 -0700 Subject: [PATCH] Remove validate-min-env-vars gating We don't use config-internal anymore, so remove validate-min-env-vars from being gated upon. This is becuse there is no minimum environment variables required. While we are at it we remove min-env. Partially-Implements: blueprint remove-config-internal Change-Id: Ibe2947b35e4dc1549e82acc66c01153495a91882 --- tools/min-env.sh | 69 ---------------------------------- tools/validate-min-env-vars.sh | 17 --------- tox.ini | 1 - 3 files changed, 87 deletions(-) delete mode 100755 tools/min-env.sh delete mode 100755 tools/validate-min-env-vars.sh diff --git a/tools/min-env.sh b/tools/min-env.sh deleted file mode 100755 index 96f76f316c..0000000000 --- a/tools/min-env.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/usr/bin/env bash -# -# This script generates the minimal environment variable doc - -# Move to top level directory -REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')") -cd "$(dirname "$REAL_PATH")/.." - -# Make sure sort produces the same output on all systems -export LC_ALL=C - -DOC=docs/minimal-environment-vars.md -DOCKERDIR="docker" -# BASE and TYPE can be hard coded to centos and rdo since the required vars will always be the same -BASE="centos" -TYPE="rdo" - -function write_header { - local header=$1 - header=${header^} - header=$(echo ${header} | sed -e 's/-app//') - echo -e "\n# $header\n" >> "$DOC" -} - -function write_env_var { - local env_var=$1 - if [ -z "$env_var" ]; then - echo "" >> "$DOC" - else - env_var=${env_var%=*} - echo " $env_var" >> "$DOC" - fi -} - -function find_vars { - local img_location=$1 - local all_vars='' - local scripts=$(find ${img_location} -name *.sh | sort -t / -k 4) - - for script in $scripts; do - local vars=$(awk '/^check_required_vars/,/([^\\] *$)/' $script) - all_vars="$all_vars $(echo "$vars" | sed 's/check_required_vars//' | sed 's/\\//g')" - done - - if [ -n "${all_vars// }" ]; then - all_vars=$(echo "${all_vars[@]}" | tr ' ' '\n' | sort -u | tr '\n' ' ') - for v in $all_vars; do - write_env_var $v - done - else - echo " None" >> "$DOC" - fi -} - -cat > $DOC <