Commit c49bf0c8 authored by Christos Stavrakakis's avatar Christos Stavrakakis

cyclades: Remove obsolete settings

Remove obsolete GANETI_DISK_TEMPLATES and DEFAULT_GANETI_DISK_TEMPLATE
settings.
parent 9f205b43
......@@ -173,6 +173,8 @@ Cyclades
* Remove obsolete setting 'API_ROOT_URL', since it is being covered by
the use of CYCLADES_BASE_URL* Remove obsolete setting 'API_ROOT_URL', since
it is being covered by 'CYCLADES_BASE_URL'.
* Remove obsolete settings GANETI_DISK_TEMPLATES and
DEFAULT_GANETI_DISK_TEMPLATE
Cyclades helpdesk
-----------------
......
......@@ -49,8 +49,6 @@ In `/etc/synnefo/cyclades.conf` add:
NET_BAR_GRAPH_URL = 'https://cyclades.example.com/stats/%s/net-bar.png'
NET_TIMESERIES_GRAPH_URL = 'https://cyclades.example.com/stats/%s/net-ts.png'
GANETI_DISK_TEMPLATES = ('blockdev', 'diskless', 'drbd', 'file', 'plain',
'rbd', 'sharedfile', 'ext')
ASTAKOS_BASE_URL = 'https://accounts.example.synnefo.org/'
SECRET_ENCRYPTION_KEY= "oEs0pt7Di1mkxA0P6FiK"
......
......@@ -82,11 +82,6 @@
## The maximum size, in bytes, for each personality file
#MAX_PERSONALITY_SIZE = 10240
#
## Available storage types to be used as disk templates
## Use ext_<provider_name> to map specific provider for `ext` disk template.
#GANETI_DISK_TEMPLATES = ('blockdev', 'diskless', 'drbd', 'file', 'plain',
# 'rbd', 'sharedfile')
#DEFAULT_GANETI_DISK_TEMPLATE = 'drbd'
#
## Top-level URL of the astakos instance to be used for user management
#ASTAKOS_BASE_URL = 'https://accounts.example.synnefo.org/'
......
......@@ -82,11 +82,6 @@ MAX_PERSONALITY = 5
# The maximum size, in bytes, for each personality file
MAX_PERSONALITY_SIZE = 10240
# Available storage types to be used as disk templates
# Use ext_<provider_name> to map specific provider for `ext` disk template.
GANETI_DISK_TEMPLATES = ('blockdev', 'diskless', 'drbd', 'file', 'plain',
'rbd', 'sharedfile')
DEFAULT_GANETI_DISK_TEMPLATE = 'drbd'
# Top-level URL of the astakos instance to be used for user management
ASTAKOS_BASE_URL = 'https://accounts.example.synnefo.org/'
......
......@@ -55,8 +55,7 @@ class Flavor(models.Model):
cpu = models.IntegerField('Number of CPUs', default=0)
ram = models.IntegerField('RAM size in MiB', default=0)
disk = models.IntegerField('Disk size in GiB', default=0)
disk_template = models.CharField('Disk template', max_length=32,
default=settings.DEFAULT_GANETI_DISK_TEMPLATE)
disk_template = models.CharField('Disk template', max_length=32)
deleted = models.BooleanField('Deleted', default=False)
class Meta:
......
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