From b7ae1b46602e34d53b5489ba9e0a7cb73d6ea418 Mon Sep 17 00:00:00 2001 From: Adam Gandelman Date: Tue, 18 Nov 2014 17:45:08 -0800 Subject: [PATCH] Remove use of GRENADE_PHASE Recently, devstack-gate accidentally stopped setting these values and there appeared to be no fallout. Looking closer, they appear to be no longer used by Grenade. This removes them from sample localrcs and docs. Change-Id: I4d1ec41bac5a05241069963d1bcd2df4070f5ea2 --- README.rst | 11 ----------- devstack.localrc.base | 1 - devstack.localrc.target | 1 - 3 files changed, 13 deletions(-) diff --git a/README.rst b/README.rst index 38106997..12ba3139 100644 --- a/README.rst +++ b/README.rst @@ -121,17 +121,6 @@ Similar steps are performed by ``prep-target`` for ``$TARGET_DEVSTACK_DIR``. exists. ``devstack.localrc`` is not included in Grenade and will not be overwritten it if it exists. -To handle differences between the DevStack releases ``GRENADE_PHASE`` will -be set to ``base`` or ``target`` so appropriate decisions can be made:: - - if [[ "$GRENADE_PHASE" == "base" ]]; then - # Handle base-specific local - : - else - # Handle target-specific local - : - fi - Prepare For An Upgrade Test --------------------------- diff --git a/devstack.localrc.base b/devstack.localrc.base index f3634833..26ee77c3 100644 --- a/devstack.localrc.base +++ b/devstack.localrc.base @@ -1,5 +1,4 @@ # localrc for DevStack base installation -GRENADE_PHASE=base # Default to selecting an interface via the default route unset HOST_IP diff --git a/devstack.localrc.target b/devstack.localrc.target index de2d1a94..1f74f475 100644 --- a/devstack.localrc.target +++ b/devstack.localrc.target @@ -1,5 +1,4 @@ # localrc for DevStack target installation (master) -GRENADE_PHASE=target # Default to selecting an interface via the default route unset HOST_IP