openstack
/
tripleo-incubator
Code Issues Proposed changes

Allow setting OS_DEBUG_LOGGING 

In t-i-e I37d8391a4984f2c34368724212c81d10dbab2dee we start supporting
an env variable OS_DEUBUG_LOGGING which controls whether we set debug
logs at build time. If -d is passed to devtest* we should be setting
this.

Change-Id: I3bb21a289d2c0d65ff1eb6865e70f2d9b554f7fb
This commit is contained in:
Gregory Haynes 2015-01-23 15:44:28 -08:00
parent 0e3448a243
commit 3d0635dc29
4 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/devtest.sh
View File

@ -39,6 +39,9 @@ function show_options () {
echo " --build-only -- Builds images but doesn't attempt to run them."
echo " --no-mergepy -- Use the standalone Heat templates."
echo " --debug-logging -- Enable debug logging in the undercloud and overcloud."
echo " This enables build time debug logs by setting the"
echo " OS_DEBUG_LOGGING env var and also sets the Debug"
echo " heat parameter."
echo " --heat-env-undercloud ENVFILE"
echo " -- heat environment file for the undercloud."
echo " --heat-env-overcloud ENVFILE"
@ -75,7 +78,11 @@ while true ; do
case "$1" in
--build-only) BUILD_ONLY=--build-only; shift 1;;
--no-mergepy) USE_MERGEPY=0; shift 1;;
--debug-logging) DEBUG_LOGGING=--debug-logging; shift 1;;
--debug-logging)
DEBUG_LOGGING=--debug-logging
export OS_DEBUG_LOGGING="1"
shift 1
;;
--trash-my-machine) CONTINUE=--trash-my-machine; shift 1;;
--existing-environment) TRIPLEO_CLEANUP=0; shift 1;;
--nodes) NODES_ARG="--nodes $2"; shift 2;;

7
scripts/devtest_overcloud.sh
View File

@ -25,6 +25,7 @@ function show_options () {
echo " --build-only -- build the needed images but don't deploy them."
echo " --no-mergepy -- use the standalone Heat templates."
echo " --debug-logging -- Turn on debug logging in the built overcloud."
echo " Sets both OS_DEBUG_LOGGING and the heat Debug parameter."
echo " --heat-env -- path to a JSON heat environment file."
echo " Defaults to \$TRIPLEO_ROOT/overcloud-env.json."
echo " --compute-flavor -- Nova flavor to use for compute nodes."
@ -52,7 +53,11 @@ while true ; do
-c) USE_CACHE=1; shift 1;;
--build-only) BUILD_ONLY="1"; shift 1;;
--no-mergepy) USE_MERGEPY=0; shift 1;;
--debug-logging) DEBUG_LOGGING="1"; shift 1;;
--debug-logging)
DEBUG_LOGGING="1"
export OS_DEBUG_LOGGING="1"
shift 1
;;
--heat-env) HEAT_ENV="$2"; shift 2;;
--compute-flavor) COMPUTE_FLAVOR="$2"; shift 2;;
--control-flavor) CONTROL_FLAVOR="$2"; shift 2;;

10
scripts/devtest_seed.sh
View File

@ -14,7 +14,9 @@ function show_options () {
echo " -h -- this help"
echo " -c -- re-use existing source/images if they exist."
echo " --build-only -- build the needed images but don't deploy them."
echo " --debug-logging -- Turn on debug logging in the seed."
echo " --debug-logging -- Turn on debug logging in the seed. Sets both the"
echo " OS_DEBUG_LOGGING env var and the debug environment"
echo " json values."
echo " --all-nodes -- use all the nodes in the testenv rather than"
echo " just the first one."
echo
@ -35,7 +37,11 @@ while true ; do
--all-nodes) ALL_NODES="true"; shift 1;;
-c) USE_CACHE=1; shift 1;;
--build-only) BUILD_ONLY="--build-only"; shift 1;;
--debug-logging) DEBUG_LOGGING="seed-debug-logging"; shift 1;;
--debug-logging)
DEBUG_LOGGING="seed-debug-logging"
export OS_DEBUG_LOGGING="1"
shift 1
;;
-h | --help) show_options 0;;
--) shift ; break ;;
*) echo "Error: unsupported option $1." ; exit 1 ;;

9
scripts/devtest_undercloud.sh
View File

@ -20,7 +20,8 @@ function show_options () {
echo " -h -- this help"
echo " -c -- re-use existing source/images if they exist."
echo " --build-only -- build the needed images but don't deploy them."
echo " --debug-logging -- Turn on debug logging in the undercloud."
echo " --debug-logging -- Turn on debug logging in the undercloud. Sets"
echo " both OS_DEBUG_LOGGING and the heat Debug parameter."
echo " --heat-env -- path to a JSON heat environment file."
echo " Defaults to \$TRIPLEO_ROOT/undercloud-env.json."
echo " --flavor -- flavor to use for the undercloud. Defaults"
@ -39,7 +40,11 @@ while true ; do
case "$1" in
-c) USE_CACHE=1; shift 1;;
--build-only) BUILD_ONLY="1"; shift 1;;
--debug-logging) DEBUG_LOGGING="1"; shift 1;;
--debug-logging)
DEBUG_LOGGING="1"
export OS_DEBUG_LOGGING="1"
shift 1
;;
--heat-env) HEAT_ENV="$2"; shift 2;;
--flavor) FLAVOR="$2"; shift 2;;
-h | --help) show_options 0;;