Revision c802789d
b/Changelog | ||
---|---|---|
173 | 173 |
* Remove obsolete setting 'API_ROOT_URL', since it is being covered by |
174 | 174 |
the use of CYCLADES_BASE_URL* Remove obsolete setting 'API_ROOT_URL', since |
175 | 175 |
it is being covered by 'CYCLADES_BASE_URL'. |
176 |
* Remove obsolete settings GANETI_DISK_TEMPLATES and |
|
177 |
DEFAULT_GANETI_DISK_TEMPLATE |
|
176 | 178 |
|
177 | 179 |
Cyclades helpdesk |
178 | 180 |
----------------- |
b/docs/scale/i-cyclades.rst | ||
---|---|---|
49 | 49 |
NET_BAR_GRAPH_URL = 'https://cyclades.example.com/stats/%s/net-bar.png' |
50 | 50 |
NET_TIMESERIES_GRAPH_URL = 'https://cyclades.example.com/stats/%s/net-ts.png' |
51 | 51 |
|
52 |
GANETI_DISK_TEMPLATES = ('blockdev', 'diskless', 'drbd', 'file', 'plain', |
|
53 |
'rbd', 'sharedfile', 'ext') |
|
54 | 52 |
ASTAKOS_BASE_URL = 'https://accounts.example.synnefo.org/' |
55 | 53 |
|
56 | 54 |
SECRET_ENCRYPTION_KEY= "oEs0pt7Di1mkxA0P6FiK" |
b/snf-cyclades-app/conf/20-snf-cyclades-app-api.conf | ||
---|---|---|
82 | 82 |
## The maximum size, in bytes, for each personality file |
83 | 83 |
#MAX_PERSONALITY_SIZE = 10240 |
84 | 84 |
# |
85 |
## Available storage types to be used as disk templates |
|
86 |
## Use ext_<provider_name> to map specific provider for `ext` disk template. |
|
87 |
#GANETI_DISK_TEMPLATES = ('blockdev', 'diskless', 'drbd', 'file', 'plain', |
|
88 |
# 'rbd', 'sharedfile') |
|
89 |
#DEFAULT_GANETI_DISK_TEMPLATE = 'drbd' |
|
90 | 85 |
# |
91 | 86 |
## Top-level URL of the astakos instance to be used for user management |
92 | 87 |
#ASTAKOS_BASE_URL = 'https://accounts.example.synnefo.org/' |
b/snf-cyclades-app/synnefo/app_settings/default/api.py | ||
---|---|---|
82 | 82 |
# The maximum size, in bytes, for each personality file |
83 | 83 |
MAX_PERSONALITY_SIZE = 10240 |
84 | 84 |
|
85 |
# Available storage types to be used as disk templates |
|
86 |
# Use ext_<provider_name> to map specific provider for `ext` disk template. |
|
87 |
GANETI_DISK_TEMPLATES = ('blockdev', 'diskless', 'drbd', 'file', 'plain', |
|
88 |
'rbd', 'sharedfile') |
|
89 |
DEFAULT_GANETI_DISK_TEMPLATE = 'drbd' |
|
90 | 85 |
|
91 | 86 |
# Top-level URL of the astakos instance to be used for user management |
92 | 87 |
ASTAKOS_BASE_URL = 'https://accounts.example.synnefo.org/' |
b/snf-cyclades-app/synnefo/db/models.py | ||
---|---|---|
55 | 55 |
cpu = models.IntegerField('Number of CPUs', default=0) |
56 | 56 |
ram = models.IntegerField('RAM size in MiB', default=0) |
57 | 57 |
disk = models.IntegerField('Disk size in GiB', default=0) |
58 |
disk_template = models.CharField('Disk template', max_length=32, |
|
59 |
default=settings.DEFAULT_GANETI_DISK_TEMPLATE) |
|
58 |
disk_template = models.CharField('Disk template', max_length=32) |
|
60 | 59 |
deleted = models.BooleanField('Deleted', default=False) |
61 | 60 |
|
62 | 61 |
class Meta: |
Also available in: Unified diff