commit b205cc8ff17885790a38a55bb5ee9facfac769cf
author Dean Troyer <dtroyer@gmail.com> Mon Feb 11 17:34:39 2013 -0600
committer Dean Troyer <dtroyer@gmail.com> Mon Feb 11 17:34:39 2013 -0600
tree 9074cdda30a1c3d6f46f01f0f01eb2aa315e80ce
parent cfb3a0f12f027fc98ceabe8ca61ca0e4bf2cb55b

Clean up configure_nova() a bit

Change-Id: I2228221051a5a4413a34ca359856d90794fce69a

lib/nova

diff --git a/lib/nova b/lib/nova
index 1681af7..9ecf4eb 100644
--- a/lib/nova
+++ b/lib/nova
@@ -166,20 +166,13 @@
         # Get the sample configuration file in place
         cp $NOVA_DIR/etc/nova/api-paste.ini $NOVA_CONF_DIR
 
-        # Rewrite the authtoken configuration for our Keystone service.
-        # This is a bit defensive to allow the sample file some variance.
-        sed -e "
-            /^admin_token/i admin_tenant_name = $SERVICE_TENANT_NAME
-            /admin_tenant_name/s/^.*$/admin_tenant_name = $SERVICE_TENANT_NAME/;
-            /admin_user/s/^.*$/admin_user = nova/;
-            /admin_password/s/^.*$/admin_password = $SERVICE_PASSWORD/;
-            s,%SERVICE_TENANT_NAME%,$SERVICE_TENANT_NAME,g;
-            s,%SERVICE_TOKEN%,$SERVICE_TOKEN,g;
-        " -i $NOVA_API_PASTE_INI
         iniset $NOVA_API_PASTE_INI filter:authtoken auth_host $SERVICE_HOST
         if is_service_enabled tls-proxy; then
             iniset $NOVA_API_PASTE_INI filter:authtoken auth_protocol $SERVICE_PROTOCOL
         fi
+        iniset $NOVA_API_PASTE_INI filter:authtoken admin_tenant_name $SERVICE_TENANT_NAME
+        iniset $NOVA_API_PASTE_INI filter:authtoken admin_user nova
+        iniset $NOVA_API_PASTE_INI filter:authtoken admin_password $SERVICE_PASSWORD
     fi
 
     iniset $NOVA_API_PASTE_INI filter:authtoken signing_dir $NOVA_AUTH_CACHE_DIR