openstack/devstack
Code Issues Proposed changes

Merge "lib/lvm: don't use $VOLUME_GROUP variable anymore"

Browse Source
This commit is contained in:
Jenkins 2016-11-28 19:30:45 +00:00 committed by Gerrit Code Review
commit e8c9e72389
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/configuration.rst
View File

@ -703,13 +703,13 @@ Cinder
~~~~~~ ~~~~~~
The logical volume group used to hold the Cinder-managed volumes is 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 ``VOLUME_NAME_PREFIX`` and the size of the volume backing file is set
with ``VOLUME_BACKING_FILE_SIZE``. with ``VOLUME_BACKING_FILE_SIZE``.
:: ::
VOLUME_GROUP="stack-volumes" VOLUME_GROUP_NAME="stack-volumes"
VOLUME_NAME_PREFIX="volume-" VOLUME_NAME_PREFIX="volume-"
VOLUME_BACKING_FILE_SIZE=10250M VOLUME_BACKING_FILE_SIZE=10250M

6
doc/source/guides/multinode-lab.rst
View File

@ -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 ``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 Linux's LVM. The name of the volume group can be changed by setting
``VOLUME_GROUP`` in ``localrc``. ``stack.sh`` deletes all logical ``VOLUME_GROUP_NAME`` in ``localrc``. ``stack.sh`` deletes all logical
volumes in ``VOLUME_GROUP`` that begin with ``VOLUME_NAME_PREFIX`` as 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 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 The details of creating the volume group depends on the server hardware
involved but looks something like this: involved but looks something like this:

6
lib/lvm
View File

@ -23,11 +23,7 @@ set +o xtrace
# Defaults # Defaults
# -------- # --------
# Name of the lvm volume groups to use/create for iscsi volumes # Name of the lvm volume groups to use/create for iscsi volumes
# This monkey-motion is for compatibility with icehouse-generation Grenade VOLUME_GROUP_NAME=${VOLUME_GROUP_NAME:-stack-volumes}
# 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}}
DEFAULT_VOLUME_GROUP_NAME=$VOLUME_GROUP_NAME-default DEFAULT_VOLUME_GROUP_NAME=$VOLUME_GROUP_NAME-default
# Backing file name is of the form $VOLUME_GROUP$BACKING_FILE_SUFFIX # Backing file name is of the form $VOLUME_GROUP$BACKING_FILE_SUFFIX