Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
snf-occi
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
itminedu
snf-occi
Commits
e90cae61
Commit
e90cae61
authored
Jul 29, 2016
by
Stavros Sachtouris
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove VOMS authentication settings
parent
ee9fae2a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
62 deletions
+7
-62
setup.py
setup.py
+1
-0
snfOCCI/APIserver.py
snfOCCI/APIserver.py
+2
-3
snfOCCI/config.py.template
snfOCCI/config.py.template
+1
-10
snfOCCI/httpd/snf_voms_auth-paste.ini
snfOCCI/httpd/snf_voms_auth-paste.ini
+0
-19
snfOCCI/httpd/snf_voms_auth.py
snfOCCI/httpd/snf_voms_auth.py
+0
-27
snfOCCI/paste_deploy/deploy-snf-occi.py
snfOCCI/paste_deploy/deploy-snf-occi.py
+3
-3
snfOCCI/paste_deploy/snf-occi-paste.ini
snfOCCI/paste_deploy/snf-occi-paste.ini
+0
-0
No files found.
setup.py
View file @
e90cae61
...
...
@@ -26,4 +26,5 @@ setup(
[paste.app_factory]
snf_occi_app = snfOCCI:main
'''
,
install_requires
=
[
'kamaki'
,
'pyssf'
,
'pyyaml'
,
'WebOb'
]
)
snfOCCI/APIserver.py
View file @
e90cae61
...
...
@@ -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
)
...
...
snfOCCI/config.py.template
View file @
e90cae61
...
...
@@ -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'
snfOCCI/httpd/snf_voms_auth-paste.ini
deleted
100644 → 0
View file @
ee9fae2a
# 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
snfOCCI/httpd/snf_voms_auth.py
deleted
100644 → 0
View file @
ee9fae2a
# 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'
))
snfOCCI/
httpd/snf_voms
.py
→
snfOCCI/
paste_deploy/deploy-snf-occi
.py
View file @
e90cae61
# Copyright (C) 2012-201
4
GRNET S.A.
# Copyright (C) 2012-201
6
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
))
snfOCCI/
httpd/snf_voms
-paste.ini
→
snfOCCI/
paste_deploy/snf-occi
-paste.ini
View file @
e90cae61
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment