Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
itminedu
synnefo
Commits
ff9efcbc
Commit
ff9efcbc
authored
Jul 17, 2013
by
Christos Stavrakakis
Browse files
cyclades: Import settings from django.conf
parent
8bbcbac8
Changes
8
Hide whitespace changes
Inline
Side-by-side
snf-cyclades-app/synnefo/db/migrations/0035_default_backend.py
View file @
ff9efcbc
...
...
@@ -4,7 +4,7 @@ from south.db import db
from
south.v2
import
DataMigration
from
django.db
import
models
from
synnefo
import
settings
from
django.conf
import
settings
class
Migration
(
DataMigration
):
...
...
snf-cyclades-app/synnefo/db/migrations/0037_network_migration.py
View file @
ff9efcbc
...
...
@@ -3,7 +3,7 @@ import datetime
from
south.db
import
db
from
south.v2
import
DataMigration
from
django.db
import
models
from
synnefo
import
settings
from
django.conf
import
settings
class
Migration
(
DataMigration
):
...
...
snf-cyclades-app/synnefo/db/models.py
View file @
ff9efcbc
...
...
@@ -38,7 +38,7 @@ import utils
from
contextlib
import
contextmanager
from
hashlib
import
sha1
from
snf_django.lib.api
import
faults
from
synnefo
import
settings
as
snf_settings
from
django.conf
import
settings
as
snf_settings
from
aes_encrypt
import
encrypt_db_charfield
,
decrypt_db_charfield
from
synnefo.db.managers
import
ForUpdateManager
,
ProtectedDeleteManager
...
...
snf-cyclades-app/synnefo/db/tests.py
View file @
ff9efcbc
...
...
@@ -33,7 +33,7 @@
from
django.test
import
TestCase
from
synnefo
import
settings
from
django.conf
import
settings
# Import pool tests
from
synnefo.db.pools.tests
import
*
...
...
snf-cyclades-app/synnefo/logic/dispatcher.py
View file @
ff9efcbc
...
...
@@ -43,7 +43,7 @@ import sys
import
os
path
=
os
.
path
.
normpath
(
os
.
path
.
join
(
os
.
getcwd
(),
'..'
))
sys
.
path
.
append
(
path
)
from
synnefo
import
settings
from
django.conf
import
settings
setup_environ
(
settings
)
from
django.db
import
close_connection
...
...
snf-cyclades-app/synnefo/logic/management/commands/backend-update-status.py
View file @
ff9efcbc
...
...
@@ -32,7 +32,7 @@ from optparse import make_option
from
django.core.management.base
import
BaseCommand
from
synnefo.management.common
import
get_backend
from
synnefo
import
settings
from
django.conf
import
settings
import
datetime
from
synnefo.db.models
import
Backend
...
...
snf-cyclades-app/synnefo/logic/reconciliation.py
View file @
ff9efcbc
...
...
@@ -57,13 +57,7 @@ For G, the operating state is True if the machine is up, False otherwise.
from
django.core.management
import
setup_environ
try
:
from
synnefo
import
settings
except
ImportError
:
raise
Exception
(
"Cannot import settings, make sure PYTHONPATH contains "
"the parent directory of the Synnefo Django project."
)
setup_environ
(
settings
)
from
django.conf
import
settings
import
logging
import
itertools
...
...
snf-cyclades-app/synnefo/logic/servers.py
View file @
ff9efcbc
...
...
@@ -7,7 +7,7 @@ from django.db import transaction
from
django.utils
import
simplejson
as
json
from
snf_django.lib.api
import
faults
from
synnefo
import
settings
from
django.conf
import
settings
from
synnefo
import
quotas
from
synnefo.api
import
util
from
synnefo.logic
import
backend
...
...
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