Combine localrc files
Use the Grenade devstack.localrc.* files as the 'default' for DevStack by pre-pending them to the devstack-vm-gate.sh generated localrc. devstack.localrc is now appended to the combined DevStack localrc to still allow it to be the final config. Normally this will be empty. Change-Id: I18cb963c4baeeeb447bcb1436521100f1372882a
This commit is contained in:
parent
70628b8970
commit
185e57abe1
30
prep-base
30
prep-base
@ -40,12 +40,26 @@ if [[ -d ${STACK_ROOT}/images ]]; then
|
||||
fi
|
||||
|
||||
# Set up base localrc
|
||||
if [[ ! -r $BASE_DEVSTACK_DIR/localrc ]]; then
|
||||
sed -e "
|
||||
s|\@BASE_RELEASE_DIR\@|$BASE_RELEASE_DIR|
|
||||
s|\@DATA_DIR@|$DATA_DIR|
|
||||
" $GRENADE_DIR/devstack.localrc.base >$BASE_DEVSTACK_DIR/localrc
|
||||
if [[ -r $GRENADE_DIR/devstack.localrc ]]; then
|
||||
cat $GRENADE_DIR/devstack.localrc >>$BASE_DEVSTACK_DIR/localrc
|
||||
fi
|
||||
|
||||
# if localrc exists and localrc.orig does not exist, save localrc to localrc.orig
|
||||
if [[ -r $BASE_DEVSTACK_DIR/localrc && ! -r $BASE_DEVSTACK_DIR/localrc.orig ]]; then
|
||||
mv $BASE_DEVSTACK_DIR/localrc $BASE_DEVSTACK_DIR/localrc.orig
|
||||
fi
|
||||
|
||||
# put devstack.localrc.target in place as localrc
|
||||
sed -e "
|
||||
s|\@BASE_RELEASE_DIR\@|$BASE_RELEASE_DIR|
|
||||
s|\@DATA_DIR@|$DATA_DIR|
|
||||
" $GRENADE_DIR/devstack.localrc.base >$BASE_DEVSTACK_DIR/localrc
|
||||
|
||||
# if localrc.orig exists, append it to localrc
|
||||
if [[ -r $BASE_DEVSTACK_DIR/localrc.orig ]]; then
|
||||
echo "#vvvvvvvvvv devstack-vm-gate.sh localrc vvvvvvvvvv" >>$BASE_DEVSTACK_DIR/localrc
|
||||
cat $BASE_DEVSTACK_DIR/localrc.orig >>$BASE_DEVSTACK_DIR/localrc
|
||||
fi
|
||||
|
||||
# if devstack.localrc exists append it to locarc
|
||||
if [[ -r $GRENADE_DIR/devstack.localrc ]]; then
|
||||
echo "#vvvvvvvvvv devstack.localrc vvvvvvvvvv" >>$BASE_DEVSTACK_DIR/localrc
|
||||
cat $GRENADE_DIR/devstack.localrc >>$BASE_DEVSTACK_DIR/localrc
|
||||
fi
|
||||
|
30
prep-target
30
prep-target
@ -40,14 +40,28 @@ if [[ -d $BASE_RELEASE_DIR/images ]]; then
|
||||
fi
|
||||
|
||||
# Set up target localrc
|
||||
if [[ ! -r $TARGET_DEVSTACK_DIR/localrc ]]; then
|
||||
sed -e "
|
||||
s|\@TARGET_RELEASE_DIR\@|$TARGET_RELEASE_DIR|
|
||||
s|\@DATA_DIR@|$DATA_DIR|
|
||||
" $GRENADE_DIR/devstack.localrc.target >$TARGET_DEVSTACK_DIR/localrc
|
||||
if [[ -r $GRENADE_DIR/devstack.localrc ]]; then
|
||||
cat $GRENADE_DIR/devstack.localrc >>$TARGET_DEVSTACK_DIR/localrc
|
||||
fi
|
||||
|
||||
# if localrc exists and localrc.orig does not exist, save localrc to localrc.orig
|
||||
if [[ -r $TARGET_DEVSTACK_DIR/localrc && ! -r $TARGET_DEVSTACK_DIR/localrc.orig ]]; then
|
||||
mv $TARGET_DEVSTACK_DIR/localrc $TARGET_DEVSTACK_DIR/localrc.orig
|
||||
fi
|
||||
|
||||
# put devstack.localrc.target in place as localrc
|
||||
sed -e "
|
||||
s|\@TARGET_RELEASE_DIR\@|$TARGET_RELEASE_DIR|
|
||||
s|\@DATA_DIR@|$DATA_DIR|
|
||||
" $GRENADE_DIR/devstack.localrc.target >$TARGET_DEVSTACK_DIR/localrc
|
||||
|
||||
# if localrc.orig exists, append it to localrc
|
||||
if [[ -r $TARGET_DEVSTACK_DIR/localrc.orig ]]; then
|
||||
echo "#vvvvvvvvvv devstack-vm-gate.sh localrc vvvvvvvvvv" >>$TARGET_DEVSTACK_DIR/localrc
|
||||
cat $TARGET_DEVSTACK_DIR/localrc.orig >>$TARGET_DEVSTACK_DIR/localrc
|
||||
fi
|
||||
|
||||
# if devstack.localrc exists append it to locarc
|
||||
if [[ -r $GRENADE_DIR/devstack.localrc ]]; then
|
||||
echo "#vvvvvvvvvv devstack.localrc vvvvvvvvvv" >>$TARGET_DEVSTACK_DIR/localrc
|
||||
cat $GRENADE_DIR/devstack.localrc >>$TARGET_DEVSTACK_DIR/localrc
|
||||
fi
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user