x/gce-api
Code Issues Proposed changes

Reanimate gceapi to work with updated gcutil

Browse Source 
Change-Id: I12bf92a9f21539487376ae5e5814d4e831290338
This commit is contained in:
alexm 2015-10-12 19:36:58 +03:00 committed by alexey-mr
parent abba54ba6a
commit deef8c294e
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devstack/plugin.sh
View File

@ -172,10 +172,10 @@ function configure_gceapi {
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_user $GCEAPI_ADMIN_USER
#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 admin_tenant_name $SERVICE_TENANT_NAME
iniset $GCEAPI_CONF_FILE DEFAULT admin_user $GCEAPI_ADMIN_USER
iniset $GCEAPI_CONF_FILE DEFAULT admin_password $SERVICE_PASSWORD
iniset $GCEAPI_CONF_FILE DEFAULT identity_uri "http://${KEYSTONE_AUTH_HOST}:35357/v2.0"
configure_gceapi_rpc_backend

6
etc/gceapi/api-paste.ini
View File

@ -11,13 +11,13 @@ paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
#######
# GCE #
#######
[composite:gce]
[composite:gceapi]
use = egg:Paste#urlmap
/: gceapi_oauth
/compute/v1/projects/: gceapi
/compute/v1/projects/: gceapi_compute
/discovery/v1/apis/compute/: gceapi_discovery
[composite:gceapi]
[composite:gceapi_compute]
use = call:gceapi.auth:pipeline_factory
keystone = gceauthtoken authtoken keystonecontext gceexecutor

4
gceapi/api/oauth.py
View File

@ -58,7 +58,9 @@ class Controller(object):
AUTH_TIMEOUT = 300
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"
AUTH_PAGE_TEMPLATE =\

2
gceapi/wsgi_ext.py
View File

@ -201,7 +201,7 @@ class Request(webob.Request):
if not self.accept_language:
return None
return self.accept_language.best_match(
i18n.get_available_languages('gceapi'))
i18n.get_available_languages())
class ActionDispatcher(object):