Commit c1282636 authored by Dimitris Aragiorgis's avatar Dimitris Aragiorgis

deploy: Add missing cyclades options for ext

The ext disk template needs some extra parameters that are defined
in cyclades settings. Add those missing settings.

Additionally remove any hardcoded references to /srv/ganeti since this
is configurable.

Change mails found in cyclades.conf to examples (e.g
user@synnefo.org).

Add shared-filer ext provider too (by installing ExtStorage
component too).
Signed-off-by: default avatarDimitris Aragiorgis <dimara@grnet.gr>
parent 905b3750
......@@ -22,7 +22,7 @@ shared_dir = /srv
flavor_cpu = 1,2,4,8
flavor_ram = 128,256,512,1024,2048,4096,8192
flavor_disk = 2,5,10,20,40,60,80,100
flavor_storage = file,ext_archipelago
flavor_storage = file,ext_archipelago,ext_shared-filer
# url to download debian wheezy image
debian_base_url = http://cdn.synnefo.org/debian_base-7.0-x86_64.diskdump
......
......@@ -22,7 +22,7 @@ shared_dir = /srv
flavor_cpu = 1,2,4,8
flavor_ram = 128,256,512,1024,2048,4096,8192
flavor_disk = 2,5,10,20,40,60,80,100
flavor_storage = file,ext_archipelago
flavor_storage = file,ext_archipelago,ext_shared-filer
# url to download debian wheezy image
debian_base_url = http://cdn.synnefo.org/debian_base-7.0-x86_64.diskdump
......
/srv/ganeti/file-storage
/srv/ganeti/shared-file-storage
%SHARED_GANETI_DIR%/file-storage
%SHARED_GANETI_DIR%/shared-file-storage
......@@ -6,14 +6,11 @@ DEFAULT_BRIDGE = '%COMMON_BRIDGE%'
MAX_VMS_PER_USER = 5
VMS_USER_QUOTA = {
'psomas@grnet.gr': 1000,
'cstavr@grnet.gr':1000,
'gmytil@cslab.ntua.gr': 20,
'ananos@cslab.ece.ntua.gr': 20,
'vkoukis@grnet.gr': 400
'user@synnefo.org': 10,
'johndoe@synnefo.org': 5
}
MAX_NETWORKS_PER_USER = 3
NETWORKS_USER_QUOTA = { 'psomas@grnet.gr': 1000 }
NETWORKS_USER_QUOTA = { 'user@synnefo.org': 10 }
CPU_BAR_GRAPH_URL = 'https://%STATS%/stats/v1.0/cpu-bar/%s'
CPU_TIMESERIES_GRAPH_URL = 'https://%STATS%/stats/v1.0/cpu-ts/%s'
NET_BAR_GRAPH_URL = 'https://%STATS%/stats/v1.0/net-bar/%s'
......@@ -92,3 +89,21 @@ CYCLADES_STATS_SECRET_KEY = "%STATS_SECRET%"
# IP and not fqdn because java VncViewer class used for machine's console
# has an issue with self-signed certificates
UI_MEDIA_URL = "https://%CYCLADES_NODE_IP%/static/ui/static/snf/"
GANETI_DISK_PROVIDER_KWARGS = {
'archipelago_cached': {
'cache':'writeback',
'heads':'16',
'secs':'63',
'provider':'archipelago'
},
'shared-filer': {
'shared_dir': '%SHARED_GANETI_DIR%/shared-file-storage'
}
}
GANETI_CLONE_PROVIDERS = [
'vlmc',
'archipelago',
'archipelago_cached'
]
......@@ -124,8 +124,6 @@ def fabcommand(args, actions):
fabfile.setup_env(args)
with settings(hide(*lhide), show(*lshow)):
print " ".join(actions)
print settings
for a in actions:
fn = getattr(fabfile, a)
execute(fn)
......
......@@ -467,7 +467,7 @@ class VMC(base.Component):
if self.cluster.synnefo:
return [
Image, GTools, GanetiCollectd,
PithosBackend, Archip, ArchipGaneti
PithosBackend, ExtStorage, Archip, ArchipGaneti
]
else:
return [ExtStorage, Archip, ArchipGaneti]
......@@ -556,8 +556,11 @@ class Ganeti(base.Component):
return commands
def _configure(self):
r = {
"SHARED_GANETI_DIR": config.ganeti_dir,
}
return [
("/etc/ganeti/file-storage-paths", {}, {}),
("/etc/ganeti/file-storage-paths", r, {}),
("/etc/default/ganeti-instance-debootstrap", {}, {}),
]
......@@ -570,7 +573,8 @@ class Ganeti(base.Component):
@base.run_cmds
def prepare(self):
return [
"mkdir -p /srv/ganeti/file-storage/",
"mkdir -p %s/file-storage/" % config.ganeti_dir,
"mkdir -p %s/shared-file-storage/" % config.ganeti_dir,
"sed -i 's/^127.*$/127.0.0.1 localhost/g' /etc/hosts",
] + self._prepare_net_infra()
......@@ -1441,6 +1445,7 @@ snf-manage network-create --subnet6={0} \
# TODO: fix java issue with no signed jar
"CYCLADES_NODE_IP": self.ctx.cyclades.ip,
"CYCLADES_SECRET": config.cyclades_secret,
"SHARED_GANETI_DIR": config.ganeti_dir,
}
return [
("/etc/synnefo/cyclades.conf", r1, {}),
......
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