openstack/trove
Code Issues Proposed changes

Merge "Remove redstack reference"

Browse Source
This commit is contained in:
Jenkins
2017-03-18 16:50:28 +00:00
committed by Gerrit Code Review
parent 107bc5e4b4 0ad14972eb
commit ee70b1d0e5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/dev/install.rst
View File

@@ -51,7 +51,7 @@ Installing trove
It is important to understand that this process is different now with It is important to understand that this process is different now with
the elements and scripts being part of the trove repository. In the the elements and scripts being part of the trove repository. In the
past, one could clone trove-integration into the home directory and past, one could clone trove-integration into the home directory and
run redstack from there, and it would clone trove in the right run trovestack from there, and it would clone trove in the right
place. And if you were making changes in trove-integration, it didn't place. And if you were making changes in trove-integration, it didn't
really matter where trove-integration was; it could be in home really matter where trove-integration was; it could be in home
directory or /opt/stack, or for that matter, anywhere. This is no directory or /opt/stack, or for that matter, anywhere. This is no

4
integration/scripts/trovestack
View File

@@ -408,8 +408,8 @@ function run_devstack() {
CONF_MATCH="*.rc" CONF_MATCH="*.rc"
MARKER_TOKEN="#####" MARKER_TOKEN="#####"
USER_LOCAL_CONF=$(readlink -f "${USER_LOCAL_CONF:-$USERHOME/$USER_LOCAL_CONF_NAME}") USER_LOCAL_CONF=$(readlink -f "${USER_LOCAL_CONF:-$USERHOME/$USER_LOCAL_CONF_NAME}")
LOCALRC_OPTS_TAG="$MARKER_TOKEN Redstack Localrc Options $MARKER_TOKEN" LOCALRC_OPTS_TAG="$MARKER_TOKEN Trovestack Localrc Options $MARKER_TOKEN"
LOCALRC_OPTS_TAG_END="$MARKER_TOKEN End Of Redstack Localrc Options $MARKER_TOKEN" LOCALRC_OPTS_TAG_END="$MARKER_TOKEN End Of Trovestack Localrc Options $MARKER_TOKEN"
USER_OPTS_TAG="$MARKER_TOKEN User Specified Options $MARKER_TOKEN" USER_OPTS_TAG="$MARKER_TOKEN User Specified Options $MARKER_TOKEN"
USER_OPTS_TAG_END="$MARKER_TOKEN End Of User Specified Options $MARKER_TOKEN" USER_OPTS_TAG_END="$MARKER_TOKEN End Of User Specified Options $MARKER_TOKEN"
ADD_OPTS_TAG="$MARKER_TOKEN Additional Options $MARKER_TOKEN" ADD_OPTS_TAG="$MARKER_TOKEN Additional Options $MARKER_TOKEN"