From f5069f35a176109e3e28347ce7e0418ffc57c4cb Mon Sep 17 00:00:00 2001 From: Jordan Pittier Date: Tue, 8 Nov 2016 12:10:12 +0100 Subject: [PATCH] lib/lvm: don't use $VOLUME_GROUP variable anymore We should be using $VOLUME_GROUP_NAME instead since Icehouse. $VOLUME_GROUP_NAME has been introduced in I93b8ef32832269d730c76a6dc24ddb4f20c6d9df and $VOLUME_GROUP is nowadays only use as a fallback to $VOLUME_GROUP_NAME. As a code comment in lib/lvm says it we kept the $VOLUME_GROUP around as "for compatibility with icehouse-generation Grenade". Icehouse is long gone so now seems a good time to remove any usage of $VOLUME_GROUP. Change-Id: Id3051b5a196c45266c39fde4f08401aaacf0f6bd --- doc/source/configuration.rst | 4 ++-- doc/source/guides/multinode-lab.rst | 6 +++--- lib/lvm | 6 +----- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 22809ebd7a..391e5bec70 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -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 diff --git a/doc/source/guides/multinode-lab.rst b/doc/source/guides/multinode-lab.rst index 8751eb8d6a..81c08dc747 100644 --- a/doc/source/guides/multinode-lab.rst +++ b/doc/source/guides/multinode-lab.rst @@ -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: diff --git a/lib/lvm b/lib/lvm index d35a76fb5f..99c7ba9b9f 100644 --- a/lib/lvm +++ b/lib/lvm @@ -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