From f5f72a15f8cdd142e1a769859af60140b9e2b097 Mon Sep 17 00:00:00 2001
From: Eoghan Glynn <eglynn@redhat.com>
Date: Tue, 21 Feb 2012 14:49:39 +0000
Subject: [PATCH] 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
---
 stack.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/stack.sh b/stack.sh
index 6e92a84fcb..6da985dacc 100755
--- a/stack.sh
+++ b/stack.sh
@@ -784,9 +784,6 @@ if is_service_enabled g-reg; then
         GLANCE_REGISTRY_PASTE_INI=$GLANCE_DIR/etc/glance-registry-paste.ini
         cp $FILES/glance-registry-paste.ini $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
 
     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
         cp $FILES/glance-api-paste.ini $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