Reanimate gceapi to work with updated gcutil
Change-Id: I12bf92a9f21539487376ae5e5814d4e831290338
This commit is contained in:
parent
abba54ba6a
commit
deef8c294e
@ -172,10 +172,10 @@ function configure_gceapi {
|
|||||||
|
|
||||||
iniset $GCEAPI_CONF_FILE DEFAULT region $REGION_NAME
|
iniset $GCEAPI_CONF_FILE DEFAULT region $REGION_NAME
|
||||||
|
|
||||||
#iniset $GCEAPI_CONF_FILE DEFAULT admin_tenant_name $SERVICE_TENANT_NAME
|
iniset $GCEAPI_CONF_FILE DEFAULT admin_tenant_name $SERVICE_TENANT_NAME
|
||||||
#iniset $GCEAPI_CONF_FILE DEFAULT admin_user $GCEAPI_ADMIN_USER
|
iniset $GCEAPI_CONF_FILE DEFAULT admin_user $GCEAPI_ADMIN_USER
|
||||||
#iniset $GCEAPI_CONF_FILE DEFAULT admin_password $SERVICE_PASSWORD
|
iniset $GCEAPI_CONF_FILE DEFAULT admin_password $SERVICE_PASSWORD
|
||||||
#iniset $GCEAPI_CONF_FILE DEFAULT keystone_url "http://${KEYSTONE_AUTH_HOST}:35357/v2.0"
|
iniset $GCEAPI_CONF_FILE DEFAULT identity_uri "http://${KEYSTONE_AUTH_HOST}:35357/v2.0"
|
||||||
|
|
||||||
configure_gceapi_rpc_backend
|
configure_gceapi_rpc_backend
|
||||||
|
|
||||||
|
@ -11,13 +11,13 @@ paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
|
|||||||
#######
|
#######
|
||||||
# GCE #
|
# GCE #
|
||||||
#######
|
#######
|
||||||
[composite:gce]
|
[composite:gceapi]
|
||||||
use = egg:Paste#urlmap
|
use = egg:Paste#urlmap
|
||||||
/: gceapi_oauth
|
/: gceapi_oauth
|
||||||
/compute/v1/projects/: gceapi
|
/compute/v1/projects/: gceapi_compute
|
||||||
/discovery/v1/apis/compute/: gceapi_discovery
|
/discovery/v1/apis/compute/: gceapi_discovery
|
||||||
|
|
||||||
[composite:gceapi]
|
[composite:gceapi_compute]
|
||||||
use = call:gceapi.auth:pipeline_factory
|
use = call:gceapi.auth:pipeline_factory
|
||||||
keystone = gceauthtoken authtoken keystonecontext gceexecutor
|
keystone = gceauthtoken authtoken keystonecontext gceexecutor
|
||||||
|
|
||||||
|
@ -58,7 +58,9 @@ class Controller(object):
|
|||||||
|
|
||||||
AUTH_TIMEOUT = 300
|
AUTH_TIMEOUT = 300
|
||||||
VALID_CLIENTS = {
|
VALID_CLIENTS = {
|
||||||
"32555940559.apps.googleusercontent.com": "ZmssLNjJy2998hD4CTg2ejr2"}
|
"32555940559.apps.googleusercontent.com": "ZmssLNjJy2998hD4CTg2ejr2",
|
||||||
|
"1025389682001.apps.googleusercontent.com": "xslsVXhA7C8aOfSfb6edB6p6",
|
||||||
|
}
|
||||||
|
|
||||||
INTERNAL_REDIRECT_URI = "urn:ietf:wg:oauth:2.0:oob"
|
INTERNAL_REDIRECT_URI = "urn:ietf:wg:oauth:2.0:oob"
|
||||||
AUTH_PAGE_TEMPLATE =\
|
AUTH_PAGE_TEMPLATE =\
|
||||||
|
@ -201,7 +201,7 @@ class Request(webob.Request):
|
|||||||
if not self.accept_language:
|
if not self.accept_language:
|
||||||
return None
|
return None
|
||||||
return self.accept_language.best_match(
|
return self.accept_language.best_match(
|
||||||
i18n.get_available_languages('gceapi'))
|
i18n.get_available_languages())
|
||||||
|
|
||||||
|
|
||||||
class ActionDispatcher(object):
|
class ActionDispatcher(object):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user