Commit fb83c76c authored by Dimitris Aragiorgis's avatar Dimitris Aragiorgis

deploy/ci: Some changes wrt disk sizes

vcluster.conf:

  disk0_size is the size of base vcluster image to debootstrap
  disk1_size if the size of the extra disk to use for LVM

ganeti.conf:

  vg_size is the size of the VG to create if an extra disk is not
found

Ganeti has a hard requirement for VG more than 20480MB.
Signed-off-by: default avatarDimitris Aragiorgis <dimara@grnet.gr>
parent c7a5e2d7
[DEFAULT]
vg = ganeti
vg_size = 2G
# Ganeti has hard requiremend for VG larger than 20480M
vg_size = 30G
# whether to add synnefo related packages
synnefo = True
......
[DEFAULT]
disk_size = 10G
disk0_size = 10G
disk1_size = 30G
# the bridge to use for the virtual cluster
# on this bridge we will launch a dnsnmasq and provide
......
[DEFAULT]
vg = ganeti
vg_size = 2G
# Ganeti has hard requiremend for VG larger than 20480M
vg_size = 30G
# whether to add synnefo related packages
synnefo = True
......
[DEFAULT]
disk_size = 10G
disk0_size = 10G
disk1_size = 30G
# the bridge to use for the virtual cluster
# on this bridge we will launch a dnsnmasq and provide
......
......@@ -7,7 +7,8 @@ EXTRA_PACKAGES=acpi-support-base,console-tools,udev,linux-image-amd64,network-ma
: ${DISK0:=/var/lib/snf-deploy/vcluster/disk0}
: ${DISK1:=/var/lib/snf-deploy/vcluster/disk1}
: ${HOSTNAME:=vc}
: ${SIZE:=2G}
: ${DISK0_SIZE:=10G}
: ${DISK1_SIZE:=30G}
: ${DISTRO:=wheezy}
: ${MIRROR:=http://ftp.gr.debian.org/debian}
: ${EXTRA_PACKAGES:=acpi-support-base,console-tools,udev,linux-image-amd64,network-manager}
......@@ -15,8 +16,8 @@ EXTRA_PACKAGES=acpi-support-base,console-tools,udev,linux-image-amd64,network-ma
set -e
truncate -s $SIZE $DISK0
truncate -s $SIZE $DISK1
truncate -s $DISK0_SIZE $DISK0
truncate -s $DISK1_SIZE $DISK1
# sfdisk -H 255 -S 63 -u S --quiet --Linux $DISK0 <<EOF
# 2048,,L,*
......
......@@ -180,9 +180,10 @@ def image():
env = os.environ.copy()
env.update({
"SIZE": config.disk_size,
"DISK0": disk0,
"DISK0_SIZE": config.disk0_size,
"DISK1": disk1,
"DISK1_SIZE": config.disk1_size,
})
cmd = os.path.join(config.lib_dir, "mkimage.sh")
......
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