openstack/devstack
Code Issues Proposed changes

Merge "Fix comments to use 'local.conf' instead of 'localrc'"

Browse Source
This commit is contained in:
Jenkins 2015-01-12 03:39:12 +00:00 committed by Gerrit Code Review
commit a41ad4d183
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
stackrc
View File

@ -33,7 +33,8 @@ REGION_NAME=${REGION_NAME:-RegionOne}
# For example, to enable Swift add this to ``local.conf``: # For example, to enable Swift add this to ``local.conf``:
# enable_service s-proxy s-object s-container s-account # enable_service s-proxy s-object s-container s-account
# In order to enable Neutron (a single node setup) add the following # In order to enable Neutron (a single node setup) add the following
# settings in `` localrc``: # settings in ``local.conf``:
# [[local|localrc]]
# disable_service n-net # disable_service n-net
# enable_service q-svc # enable_service q-svc
# enable_service q-agt # enable_service q-agt
@ -529,8 +530,8 @@ CIRROS_VERSION=${CIRROS_VERSION:-"0.3.2"}
CIRROS_ARCH=${CIRROS_ARCH:-"x86_64"} CIRROS_ARCH=${CIRROS_ARCH:-"x86_64"}
# Set default image based on ``VIRT_DRIVER`` and ``LIBVIRT_TYPE``, either of # Set default image based on ``VIRT_DRIVER`` and ``LIBVIRT_TYPE``, either of
# which may be set in ``localrc``. Also allow ``DEFAULT_IMAGE_NAME`` and # which may be set in ``local.conf``. Also allow ``DEFAULT_IMAGE_NAME`` and
# ``IMAGE_URLS`` to be set directly in ``localrc``. # ``IMAGE_URLS`` to be set in the `localrc` section of ``local.conf``.
case "$VIRT_DRIVER" in case "$VIRT_DRIVER" in
openvz) openvz)
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-ubuntu-12.04-x86_64} DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-ubuntu-12.04-x86_64}