@@ -703,13 +703,13 @@ Cinder

 ~~~~~~

 The logical volume group used to hold the Cinder-managed volumes is

-set by ``VOLUME_GROUP``, the logical volume name prefix is set with

+set by ``VOLUME_GROUP_NAME``, the logical volume name prefix is set with

 ``VOLUME_NAME_PREFIX`` and the size of the volume backing file is set

 with ``VOLUME_BACKING_FILE_SIZE``.

     ::

-        VOLUME_GROUP="stack-volumes"

+        VOLUME_GROUP_NAME="stack-volumes"

         VOLUME_NAME_PREFIX="volume-"

         VOLUME_BACKING_FILE_SIZE=10250M

@@ -294,10 +294,10 @@ created inside OpenStack. The size can be overridden by setting

 ``stack-volumes`` can be pre-created on any physical volume supported by

 Linux's LVM. The name of the volume group can be changed by setting

-``VOLUME_GROUP`` in ``localrc``. ``stack.sh`` deletes all logical

-volumes in ``VOLUME_GROUP`` that begin with ``VOLUME_NAME_PREFIX`` as

+``VOLUME_GROUP_NAME`` in ``localrc``. ``stack.sh`` deletes all logical

+volumes in ``VOLUME_GROUP_NAME`` that begin with ``VOLUME_NAME_PREFIX`` as

 part of cleaning up from previous runs. It is recommended to not use the

-root volume group as ``VOLUME_GROUP``.

+root volume group as ``VOLUME_GROUP_NAME``.

 The details of creating the volume group depends on the server hardware

 involved but looks something like this:

@@ -23,11 +23,7 @@ set +o xtrace

 # Defaults

 # --------

 # Name of the lvm volume groups to use/create for iscsi volumes

-# This monkey-motion is for compatibility with icehouse-generation Grenade

-# If ``VOLUME_GROUP`` is set, use it, otherwise we'll build a VG name based

-# on ``VOLUME_GROUP_NAME`` that includes the backend name

-# Grenade doesn't use ``VOLUME_GROUP2`` so it is left out

-VOLUME_GROUP_NAME=${VOLUME_GROUP:-${VOLUME_GROUP_NAME:-stack-volumes}}

+VOLUME_GROUP_NAME=${VOLUME_GROUP_NAME:-stack-volumes}

 DEFAULT_VOLUME_GROUP_NAME=$VOLUME_GROUP_NAME-default

 # Backing file name is of the form $VOLUME_GROUP$BACKING_FILE_SUFFIX