[openstack-glance/el6-havana] refactor authtoken config editing

[Pádraig Brady]

commit 2e0b993446a297e58aec79ac22012eed39e378ae
Author: Pádraig Brady <P at draigBrady.com>
Date:   Wed Oct 2 15:03:18 2013 +0100

    refactor authtoken config editing
    
    Conflicts:
    
    	openstack-glance.spec

 openstack-glance.spec |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/openstack-glance.spec b/openstack-glance.spec
index 818de97..2cfa482 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -144,19 +144,13 @@ rm -rf {test-,}requirements.txt tools/{pip,test}-requires
 %build
 
 # Change the default config
+
 # Move authtoken configuration out of paste.ini
-openstack-config --del etc/glance-api-paste.ini filter:authtoken admin_tenant_name
-openstack-config --del etc/glance-api-paste.ini filter:authtoken admin_user
-openstack-config --del etc/glance-api-paste.ini filter:authtoken admin_password
-openstack-config --del etc/glance-api-paste.ini filter:authtoken auth_host
-openstack-config --del etc/glance-api-paste.ini filter:authtoken auth_port
-openstack-config --del etc/glance-api-paste.ini filter:authtoken auth_protocol
-openstack-config --del etc/glance-registry-paste.ini filter:authtoken admin_tenant_name
-openstack-config --del etc/glance-registry-paste.ini filter:authtoken admin_user
-openstack-config --del etc/glance-registry-paste.ini filter:authtoken admin_password
-openstack-config --del etc/glance-registry-paste.ini filter:authtoken auth_host
-openstack-config --del etc/glance-registry-paste.ini filter:authtoken auth_port
-openstack-config --del etc/glance-registry-paste.ini filter:authtoken auth_protocol
+for svc in api registry; do
+  for var in admin_tenant_name admin_user admin_password auth_host auth_port auth_protocol; do
+    openstack-config --del etc/glance-$svc-paste.ini filter:authtoken $var
+  done
+done
 
 %{__python} setup.py build