Commit d803abac authored by User's avatar User

Fix unexpected errors, add flags

parent 9d034cf7
......@@ -18,7 +18,7 @@ from snfOCCI.network import NetworkBackend, IpNetworkBackend, IpNetworkInterface
from kamaki.clients.cyclades import CycladesNetworkClient
from snfOCCI.extensions import snf_addons
ASTAVOMS_IS_KEYSTONE = False
ASTAVOMS_IS_KEYSTONE = True
# from kamaki.clients.compute import ComputeClient
from kamaki.clients.cyclades import CycladesComputeClient as ComputeClient
......
<<<<<<< HEAD
'''
Created on Sep 9, 2013
@author: nassia
'''
from snfOCCI.config import SERVER_CONFIG
=======
# Copyright (C) 2012-2015 GRNET S.A.
#
# This program is free software: you can redistribute it and/or modify
......
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