@@ -17,6 +17,7 @@ James E. Blair <james.blair@rackspace.com>

 Jason Cannavale <jason.cannavale@rackspace.com>

 Jay Pipes <jaypipes@gmail.com>

 Jesse Andrews <anotherjesse@gmail.com>

+Joe Gordon <jogo@cloudscaling.com>

 Johannes Erdfelt <johannes.erdfelt@rackspace.com>

 Josh Kearney <josh@jk0.org>

 Justin Shepherd <galstrom21@gmail.com>

@@ -23,8 +23,6 @@ operator_roles = Member,admin

 # username and password.

 [filter:s3token]

 paste.filter_factory = keystone.middleware.s3_token:filter_factory

-service_port = %KEYSTONE_SERVICE_PORT%

-service_host = %KEYSTONE_SERVICE_HOST%

 auth_port = %KEYSTONE_AUTH_PORT%

 auth_host = %KEYSTONE_AUTH_HOST%

 auth_protocol = %KEYSTONE_AUTH_PROTOCOL%

@@ -1441,8 +1441,6 @@ if is_service_enabled swift; then

        s,%SERVICE_PASSWORD%,$SERVICE_PASSWORD,g;

        s,%KEYSTONE_SERVICE_PROTOCOL%,$KEYSTONE_SERVICE_PROTOCOL,g;

        s,%SERVICE_TOKEN%,${SERVICE_TOKEN},g;

-       s,%KEYSTONE_SERVICE_PORT%,${KEYSTONE_SERVICE_PORT},g;

-       s,%KEYSTONE_SERVICE_HOST%,${KEYSTONE_SERVICE_HOST},g;

        s,%KEYSTONE_API_PORT%,${KEYSTONE_API_PORT},g;

        s,%KEYSTONE_AUTH_HOST%,${KEYSTONE_AUTH_HOST},g;

        s,%KEYSTONE_AUTH_PORT%,${KEYSTONE_AUTH_PORT},g;