Browse code
Remove duplicated glance paste config.
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
Eoghan Glynn authored on 2012/02/21 23:49:39Showing 1 changed files
| ... | ... |
@@ -784,9 +784,6 @@ if is_service_enabled g-reg; then |
| 784 | 784 |
GLANCE_REGISTRY_PASTE_INI=$GLANCE_DIR/etc/glance-registry-paste.ini |
| 785 | 785 |
cp $FILES/glance-registry-paste.ini $GLANCE_REGISTRY_PASTE_INI |
| 786 | 786 |
glance_config $GLANCE_REGISTRY_PASTE_INI |
| 787 |
- # During the transition for Glance to the split config files |
|
| 788 |
- # we cat them together to handle both pre- and post-merge |
|
| 789 |
- cat $GLANCE_REGISTRY_PASTE_INI >>$GLANCE_REGISTRY_CONF |
|
| 790 | 787 |
fi |
| 791 | 788 |
|
| 792 | 789 |
GLANCE_API_CONF=$GLANCE_DIR/etc/glance-api.conf |
| ... | ... |
@@ -797,9 +794,6 @@ if is_service_enabled g-reg; then |
| 797 | 797 |
GLANCE_API_PASTE_INI=$GLANCE_DIR/etc/glance-api-paste.ini |
| 798 | 798 |
cp $FILES/glance-api-paste.ini $GLANCE_API_PASTE_INI |
| 799 | 799 |
glance_config $GLANCE_API_PASTE_INI |
| 800 |
- # During the transition for Glance to the split config files |
|
| 801 |
- # we cat them together to handle both pre- and post-merge |
|
| 802 |
- cat $GLANCE_API_PASTE_INI >>$GLANCE_API_CONF |
|
| 803 | 800 |
fi |
| 804 | 801 |
fi |
| 805 | 802 |
|