openstack/devstack
Code Issues Proposed changes

Remove duplicated glance paste config.

Browse Source 
When glance paste config was split out from the core config,
devstack duplicated the former in both files in order to work
around the chicken-and-egg problem with the glance change being
gated on devstack passing.

This transitionary arrangement is no longer required so may now
be removed.

Change-Id: I42ff9cd8ea9cae62a2a0cb72490f1c8a6c17056c
This commit is contained in:
Eoghan Glynn 2012-02-21 14:49:39 +00:00
parent f62caf6db4
commit f5f72a15f8
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stack.sh
View File

@ -784,9 +784,6 @@ if is_service_enabled g-reg; then
GLANCE_REGISTRY_PASTE_INI=$GLANCE_DIR/etc/glance-registry-paste.ini GLANCE_REGISTRY_PASTE_INI=$GLANCE_DIR/etc/glance-registry-paste.ini
cp $FILES/glance-registry-paste.ini $GLANCE_REGISTRY_PASTE_INI cp $FILES/glance-registry-paste.ini $GLANCE_REGISTRY_PASTE_INI
glance_config $GLANCE_REGISTRY_PASTE_INI glance_config $GLANCE_REGISTRY_PASTE_INI
# During the transition for Glance to the split config files
# we cat them together to handle both pre- and post-merge
cat $GLANCE_REGISTRY_PASTE_INI >>$GLANCE_REGISTRY_CONF
fi fi
GLANCE_API_CONF=$GLANCE_DIR/etc/glance-api.conf GLANCE_API_CONF=$GLANCE_DIR/etc/glance-api.conf
@ -797,9 +794,6 @@ if is_service_enabled g-reg; then
GLANCE_API_PASTE_INI=$GLANCE_DIR/etc/glance-api-paste.ini GLANCE_API_PASTE_INI=$GLANCE_DIR/etc/glance-api-paste.ini
cp $FILES/glance-api-paste.ini $GLANCE_API_PASTE_INI cp $FILES/glance-api-paste.ini $GLANCE_API_PASTE_INI
glance_config $GLANCE_API_PASTE_INI glance_config $GLANCE_API_PASTE_INI
# During the transition for Glance to the split config files
# we cat them together to handle both pre- and post-merge
cat $GLANCE_API_PASTE_INI >>$GLANCE_API_CONF
fi fi
fi fi