openstack/devstack
Code Issues Proposed changes

Update samples

Browse Source 
* Skip commands for services that are not started in local.sh
* Rename localrc to local.conf

Change-Id: Ida3a8cc836d56db94da4a133fbeb81c7f5fc5f26
This commit is contained in:
Dean Troyer 2014-01-10 12:05:51 -06:00
parent bd49958794
commit 38e38fb16d
2 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
samples/localrc → samples/local.conf
View File

@ -1,19 +1,22 @@
# Sample ``localrc`` for user-configurable variables in ``stack.sh`` # Sample ``local.conf`` for user-configurable variables in ``stack.sh``
# NOTE: Copy this file to the root ``devstack`` directory for it to # NOTE: Copy this file to the root ``devstack`` directory for it to
# work properly. # work properly.
# ``localrc`` is a user-maintained setings file that is sourced from ``stackrc``. # ``local.conf`` is a user-maintained setings file that is sourced from ``stackrc``.
# This gives it the ability to override any variables set in ``stackrc``. # This gives it the ability to override any variables set in ``stackrc``.
# Also, most of the settings in ``stack.sh`` are written to only be set if no # Also, most of the settings in ``stack.sh`` are written to only be set if no
# value has already been set; this lets ``localrc`` effectively override the # value has already been set; this lets ``local.conf`` effectively override the
# default values. # default values.
# This is a collection of some of the settings we have found to be useful # This is a collection of some of the settings we have found to be useful
# in our DevStack development environments. Additional settings are described # in our DevStack development environments. Additional settings are described
# in http://devstack.org/localrc.html # in http://devstack.org/local.conf.html
# These should be considered as samples and are unsupported DevStack code. # These should be considered as samples and are unsupported DevStack code.
# The ``localrc`` section replaces the old ``localrc`` configuration file.
# Note that if ``localrc`` is present it will be used in favor of this section.
[[local|localrc]]
# Minimal Contents # Minimal Contents
# ---------------- # ----------------
@ -22,7 +25,7 @@
# there are a few minimal variables set: # there are a few minimal variables set:
# If the ``*_PASSWORD`` variables are not set here you will be prompted to enter # If the ``*_PASSWORD`` variables are not set here you will be prompted to enter
# values for them by ``stack.sh`` and they will be added to ``localrc``. # values for them by ``stack.sh`` and they will be added to ``local.conf``.
ADMIN_PASSWORD=nomoresecrete ADMIN_PASSWORD=nomoresecrete
MYSQL_PASSWORD=stackdb MYSQL_PASSWORD=stackdb
RABBIT_PASSWORD=stackqueue RABBIT_PASSWORD=stackqueue

4
samples/local.sh
View File

@ -23,6 +23,7 @@ source $TOP_DIR/stackrc
# Destination path for installation ``DEST`` # Destination path for installation ``DEST``
DEST=${DEST:-/opt/stack} DEST=${DEST:-/opt/stack}
if is_service_enabled nova; then
# Import ssh keys # Import ssh keys
# --------------- # ---------------
@ -30,7 +31,7 @@ DEST=${DEST:-/opt/stack}
# Import keys from the current user into the default OpenStack user (usually # Import keys from the current user into the default OpenStack user (usually
# ``demo``) # ``demo``)
# Get OpenStack auth # Get OpenStack user auth
source $TOP_DIR/openrc source $TOP_DIR/openrc
# Add first keypair found in localhost:$HOME/.ssh # Add first keypair found in localhost:$HOME/.ssh
@ -65,3 +66,4 @@ fi
nova secgroup-add-rule default tcp 22 22 0.0.0.0/0 nova secgroup-add-rule default tcp 22 22 0.0.0.0/0
nova secgroup-add-rule default icmp -1 -1 0.0.0.0/0 nova secgroup-add-rule default icmp -1 -1 0.0.0.0/0
fi