openstack/tripleo-incubator
Code Issues Proposed changes

Announce deprecation of --no-mergepy option

Browse Source 
Change-Id: I3abdf564d192af6060a00aab407f91ec24686c84
This commit is contained in:
Giulio Fidente 2015-04-24 11:37:07 +02:00
parent a2c704c0ed
commit 0e6d832318
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/puppet.rst
View File

@ -134,9 +134,9 @@ in your environment.
export DIB_INSTALLTYPE_puppet_modules=source export DIB_INSTALLTYPE_puppet_modules=source
8) Source your undercloud environment RC file (perhaps via the select-cloud script). Then execute devtest_overcloud.sh using the new no-mergepy templates:: 8) Source your undercloud environment RC file (perhaps via the select-cloud script). Then execute devtest_overcloud.sh::
devtest_overcloud.sh --no-mergepy devtest_overcloud.sh
References References
---------- ----------

8
scripts/devtest.sh
View File

@ -37,7 +37,7 @@ function show_options {
echo " --no-undercloud -- Use the seed as the baremetal cloud to deploy the" echo " --no-undercloud -- Use the seed as the baremetal cloud to deploy the"
echo " overcloud from." echo " overcloud from."
echo " --build-only -- Builds images but doesn't attempt to run them." echo " --build-only -- Builds images but doesn't attempt to run them."
echo " --no-mergepy -- Use the standalone Heat templates." echo " --no-mergepy -- Use the standalone Heat templates (default)."
echo " --debug-logging -- Enable debug logging in the undercloud and overcloud." echo " --debug-logging -- Enable debug logging in the undercloud and overcloud."
echo " This enables build time debug logs by setting the" echo " This enables build time debug logs by setting the"
echo " OS_DEBUG_LOGGING env var and also sets the Debug" echo " OS_DEBUG_LOGGING env var and also sets the Debug"
@ -80,7 +80,11 @@ eval set -- "$TEMP"
while true ; do while true ; do
case "$1" in case "$1" in
--build-only) BUILD_ONLY=--build-only; shift 1;; --build-only) BUILD_ONLY=--build-only; shift 1;;
--no-mergepy) USE_MERGEPY=0; shift 1;; --no-mergepy)
USE_MERGEPY=0
echo "Warning: --no-mergepy is the default now, option is DEPRECATED" >&2
shift 1
;;
--debug-logging) --debug-logging)
DEBUG_LOGGING=--debug-logging DEBUG_LOGGING=--debug-logging
export OS_DEBUG_LOGGING="1" export OS_DEBUG_LOGGING="1"

8
scripts/devtest_overcloud.sh
View File

@ -23,7 +23,7 @@ function show_options {
echo " -h -- this help" echo " -h -- this help"
echo " -c -- re-use existing source/images if they exist." echo " -c -- re-use existing source/images if they exist."
echo " --build-only -- build the needed images but don't deploy them." echo " --build-only -- build the needed images but don't deploy them."
echo " --no-mergepy -- use the standalone Heat templates." echo " --no-mergepy -- use the standalone Heat templates (default)."
echo " --debug-logging -- Turn on debug logging in the built overcloud." echo " --debug-logging -- Turn on debug logging in the built overcloud."
echo " Sets both OS_DEBUG_LOGGING and the heat Debug parameter." echo " Sets both OS_DEBUG_LOGGING and the heat Debug parameter."
echo " --heat-env -- path to a JSON heat environment file." echo " --heat-env -- path to a JSON heat environment file."
@ -55,7 +55,11 @@ while true ; do
case "$1" in case "$1" in
-c) USE_CACHE=1; shift 1;; -c) USE_CACHE=1; shift 1;;
--build-only) BUILD_ONLY="1"; shift 1;; --build-only) BUILD_ONLY="1"; shift 1;;
--no-mergepy) USE_MERGEPY=0; shift 1;; --no-mergepy)
USE_MERGEPY=0
echo "Warning: --no-mergepy is the default now, option is DEPRECATED" >&2
shift 1
;;
--debug-logging) --debug-logging)
DEBUG_LOGGING="1" DEBUG_LOGGING="1"
export OS_DEBUG_LOGGING="1" export OS_DEBUG_LOGGING="1"