Commit 50cd207b authored by Stavros Sachtouris's avatar Stavros Sachtouris

Merge ASTAVOMS_URL, KEYSTONE_URI to KEYSTONE_URL

parent d803abac
...@@ -12,14 +12,12 @@ import uuid ...@@ -12,14 +12,12 @@ import uuid
from snfOCCI.registry import snfRegistry from snfOCCI.registry import snfRegistry
from snfOCCI.compute import ComputeBackend, SNFBackend from snfOCCI.compute import ComputeBackend, SNFBackend
from snfOCCI.config import SERVER_CONFIG, KAMAKI_CONFIG, VOMS_CONFIG, ASTAVOMS_URL from snfOCCI.config import SERVER_CONFIG, KAMAKI_CONFIG, VOMS_CONFIG, KEYSTONE_URL
from snfOCCI import snf_voms from snfOCCI import snf_voms
from snfOCCI.network import NetworkBackend, IpNetworkBackend, IpNetworkInterfaceBackend, NetworkInterfaceBackend from snfOCCI.network import NetworkBackend, IpNetworkBackend, IpNetworkInterfaceBackend, NetworkInterfaceBackend
from kamaki.clients.cyclades import CycladesNetworkClient from kamaki.clients.cyclades import CycladesNetworkClient
from snfOCCI.extensions import snf_addons from snfOCCI.extensions import snf_addons
ASTAVOMS_IS_KEYSTONE = True
# from kamaki.clients.compute import ComputeClient # from kamaki.clients.compute import ComputeClient
from kamaki.clients.cyclades import CycladesComputeClient as ComputeClient from kamaki.clients.cyclades import CycladesComputeClient as ComputeClient
from kamaki.clients.cyclades import CycladesClient from kamaki.clients.cyclades import CycladesClient
...@@ -38,11 +36,6 @@ from webob import Request ...@@ -38,11 +36,6 @@ from webob import Request
from pprint import pprint from pprint import pprint
if ASTAVOMS_IS_KEYSTONE:
KEYSTONE_URI = ASTAVOMS_URL
else:
KEYSTONE_URI = 'https://okeanos-occi2.hellasgrid.gr:5000/main'
def parse_arguments(args): def parse_arguments(args):
kw = dict( kw = dict(
...@@ -302,9 +295,9 @@ class MyAPP(wsgi.Application): ...@@ -302,9 +295,9 @@ class MyAPP(wsgi.Application):
headers = [ headers = [
('Content-Type', 'text/html'), ('Content-Type', 'text/html'),
('Www-Authenticate', 'Keystone uri=\'{uri}\''.format( ('Www-Authenticate', 'Keystone uri=\'{uri}\''.format(
uri=KEYSTONE_URI))] uri=KEYSTONE_URL))]
response(status,headers) response(status,headers)
print 'Ask for redirect to URL {uri}'.format(uri=KEYSTONE_URI) print 'Ask for redirect to URL {uri}'.format(uri=KEYSTONE_URL)
return [str(response)] return [str(response)]
print 'An authentication token has been provided' print 'An authentication token has been provided'
environ['HTTP_AUTH_TOKEN'] = req.environ['HTTP_X_AUTH_TOKEN'] environ['HTTP_AUTH_TOKEN'] = req.environ['HTTP_X_AUTH_TOKEN']
...@@ -346,9 +339,9 @@ class MyAPP(wsgi.Application): ...@@ -346,9 +339,9 @@ class MyAPP(wsgi.Application):
headers = [ headers = [
('Content-Type', 'text/html'), ('Content-Type', 'text/html'),
('Www-Authenticate', 'Keystone uri=\'{uri}\''.format( ('Www-Authenticate', 'Keystone uri=\'{uri}\''.format(
uri=KEYSTONE_URI))] uri=KEYSTONE_URL))]
response(status,headers) response(status,headers)
print 'Ask for redirect to {uri}'.format(uri=KEYSTONE_URI) print 'Ask for redirect to {uri}'.format(uri=KEYSTONE_URL)
return [str(response)] return [str(response)]
else: else:
print 'I have a token and a project, we can proceed' print 'I have a token and a project, we can proceed'
......
...@@ -20,4 +20,4 @@ VOMS_CONFIG = { ...@@ -20,4 +20,4 @@ VOMS_CONFIG = {
'token' : 'rCfDs3MHoh_h6ZgA7KofBfxWGOeSuXeVVJ4US21I9FM' 'token' : 'rCfDs3MHoh_h6ZgA7KofBfxWGOeSuXeVVJ4US21I9FM'
} }
ASTAVOMS_URL = 'https://okeanos-astavoms.hellasgrid.gr' KEYSTONE_URL = 'https://okeanos-astavoms.hellasgrid.gr'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment