Commit e90cae61 authored by Stavros Sachtouris's avatar Stavros Sachtouris

Remove VOMS authentication settings

parent ee9fae2a
......@@ -26,4 +26,5 @@ setup(
[paste.app_factory]
snf_occi_app = snfOCCI:main
''',
install_requires=['kamaki', 'pyssf', 'pyyaml', 'WebOb']
)
......@@ -18,7 +18,7 @@ import uuid
from snfOCCI.registry import snfRegistry
from snfOCCI.compute import ComputeBackend, SNFBackend
from snfOCCI import config
from snfOCCI.config import VOMS_CONFIG, KEYSTONE_URL
from snfOCCI.config import KEYSTONE_URL
from snfOCCI.network import (
NetworkBackend, IpNetworkBackend, IpNetworkInterfaceBackend,
NetworkInterfaceBackend)
......@@ -47,8 +47,7 @@ class MyAPP(wsgi.Application):
def __init__(self):
"""Initialization of the WSGI OCCI application for synnefo"""
global ENABLE_VOMS, VOMS_DB
ENABLE_VOMS = VOMS_CONFIG['enable_voms']
global VOMS_DB
super(MyAPP, self).__init__(registry=snfRegistry())
self._register_backends()
VALIDATOR_APP = validator(self)
......
......@@ -10,15 +10,6 @@ KAMAKI = {
'network_url': 'https://cyclades.example.com/network/v2.0'
}
VOMS_CONFIG = {
'enable_voms': 'True',
'voms_policy': '/etc/snf/voms.json',
'vomsdir_path': '/etc/grid-security/vomsdir/',
'ca_path': '/etc/grid-security/certificates/',
'cert_dir': '/etc/ssl/certs/',
'key_dir': '/etc/ssl/private/',
'token': 'synnefo token'
}
KEYSTONE_URL = 'https://okeanos-astavoms.example.com'
HOSTNAME = 'https://this-host.example.com'
PASTEDEPLOY = '/home/user/snf-occi/snfOCCI/paste_deploy/snf-occi-paste.ini'
# Copyright (C) 2012-2016 GRNET S.A.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# snf_voms authentication PasteDeploy configuration file
[composite:main]
use = egg:Paste#urlmap
# Copyright (C) 2012-2014 GRNET S.A.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# import os
from paste import deploy
from snfOCCI.config import CNF
import logging
LOG = logging.getLogger(__name__)
# NOTE(ldbragst): 'application' is required in this context by WSGI spec.
# The following is a reference to Python Paste Deploy documentation
# http://pythonpaste.org/deploy/
application = deploy.loadapp('config:%s' % CNF.get('pastedeploy', 'auth_ini'))
# Copyright (C) 2012-2014 GRNET S.A.
# Copyright (C) 2012-2016 GRNET S.A.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -14,7 +14,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from paste import deploy
from snfOCCI.config import CNF
from snfOCCI.config import PASTEDEPLOY
import logging
LOG = logging.getLogger(__name__)
......@@ -22,4 +22,4 @@ LOG = logging.getLogger(__name__)
# NOTE(ldbragst): 'application' is required in this context by WSGI spec.
# The following is a reference to Python Paste Deploy documentation
# http://pythonpaste.org/deploy/
application = deploy.loadapp('config:%s' % CNF.get('pastedeploy', 'ini'))
application = deploy.loadapp('config:{0}'.format(PASTEDEPLOY))
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