Skip to content

Commit 6d37af8

Browse files
Pearl1594Pearl1594
committed
upgraded sysvm template + temporary changes wrt sysvm url path
1 parent fde0185 commit 6d37af8

File tree

5 files changed

+28
-14
lines changed

5 files changed

+28
-14
lines changed

‎engine/schema/pom.xml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@
7171
<goal>wget</goal>
7272
</goals>
7373
<configuration>
74-
<url>https://download.cloudstack.org/systemvm/4.16/md5sum.txt</url>
74+
<!-- <url>https://download.cloudstack.org/systemvm/4.16/md5sum.txt</url>-->
75+
<url>http://10.0.3.122/systemvmtemplate/custom/cks-debian/4.16/md5sum.txt</url>
7576
<outputDirectory>${basedir}/dist/systemvm-templates/</outputDirectory>
7677
</configuration>
7778
</execution>
@@ -122,7 +123,8 @@
122123
<goal>wget</goal>
123124
</goals>
124125
<configuration>
125-
<url>https://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-kvm.qcow2.bz2</url>
126+
<!-- <url>https://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-kvm.qcow2.bz2</url>-->
127+
<url>http://10.0.3.122/systemvmtemplate/custom/cks-debian/4.16/systemvmtemplate-4.16.0-kvm.qcow2.bz2</url>
126128
<outputDirectory>${basedir}/dist/systemvm-templates/</outputDirectory>
127129
</configuration>
128130
</execution>
@@ -132,7 +134,8 @@
132134
<goal>wget</goal>
133135
</goals>
134136
<configuration>
135-
<url>https://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-vmware.ova</url>
137+
<!-- <url>https://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-vmware.ova</url>-->
138+
<url>http://10.0.3.122/systemvmtemplate/custom/cks-debian/4.16/systemvmtemplate-4.16.0-vmware.ova</url>
136139
<outputDirectory>${basedir}/dist/systemvm-templates/</outputDirectory>
137140
</configuration>
138141
</execution>
@@ -142,7 +145,8 @@
142145
<goal>wget</goal>
143146
</goals>
144147
<configuration>
145-
<url>https://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-xen.vhd.bz2</url>
148+
<!-- <url>https://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-xen.vhd.bz2</url>-->
149+
<url>http://10.0.3.122/systemvmtemplate/custom/cks-debian/4.16/systemvmtemplate-4.16.0-xen.vhd.bz2</url>
146150
<outputDirectory>${basedir}/dist/systemvm-templates/</outputDirectory>
147151
</configuration>
148152
</execution>

‎engine/schema/templateConfig.sh‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,20 @@ function createMetadataFile() {
6868

6969
declare -A templates
7070
getTemplateVersion $1
71-
templates=( ["kvm"]="https://download.cloudstack.org/systemvm/${CS_VERSION}/systemvmtemplate-${CS_VERSION}.${CS_MINOR_VERSION}-kvm.qcow2.bz2"
72-
["vmware"]="https://download.cloudstack.org/systemvm/${CS_VERSION}/systemvmtemplate-${CS_VERSION}.${CS_MINOR_VERSION}-vmware.ova"
73-
["xenserver"]="https://download.cloudstack.org/systemvm/$CS_VERSION/systemvmtemplate-$CS_VERSION.$CS_MINOR_VERSION-xen.vhd.bz2"
74-
["hyperv"]="https://download.cloudstack.org/systemvm/$CS_VERSION/systemvmtemplate-$CS_VERSION.$CS_MINOR_VERSION-hyperv.vhd.zip"
75-
["lxc"]="https://download.cloudstack.org/systemvm/$CS_VERSION/systemvmtemplate-$CS_VERSION.$CS_MINOR_VERSION-kvm.qcow2.bz2"
76-
["ovm3"]="https://download.cloudstack.org/systemvm/$CS_VERSION/systemvmtemplate-$CS_VERSION.$CS_MINOR_VERSION-ovm.raw.bz2" )
71+
# TODO: Update correct url post testing
72+
#templates=( ["kvm"]="https://download.cloudstack.org/systemvm/${CS_VERSION}/systemvmtemplate-${CS_VERSION}.${CS_MINOR_VERSION}-kvm.qcow2.bz2"
73+
# ["vmware"]="https://download.cloudstack.org/systemvm/${CS_VERSION}/systemvmtemplate-${CS_VERSION}.${CS_MINOR_VERSION}-vmware.ova"
74+
# ["xenserver"]="https://download.cloudstack.org/systemvm/$CS_VERSION/systemvmtemplate-$CS_VERSION.$CS_MINOR_VERSION-xen.vhd.bz2"
75+
# ["hyperv"]="https://download.cloudstack.org/systemvm/$CS_VERSION/systemvmtemplate-$CS_VERSION.$CS_MINOR_VERSION-hyperv.vhd.zip"
76+
# ["lxc"]="https://download.cloudstack.org/systemvm/$CS_VERSION/systemvmtemplate-$CS_VERSION.$CS_MINOR_VERSION-kvm.qcow2.bz2"
77+
# ["ovm3"]="https://download.cloudstack.org/systemvm/$CS_VERSION/systemvmtemplate-$CS_VERSION.$CS_MINOR_VERSION-ovm.raw.bz2" )
78+
79+
templates=( ["kvm"]="http://10.0.3.122/systemvmtemplate/custom/cks-debian/${CS_VERSION}/systemvmtemplate-${CS_VERSION}.${CS_MINOR_VERSION}-kvm.qcow2.bz2"
80+
["vmware"]="http://10.0.3.122/systemvmtemplate/custom/cks-debian/${CS_VERSION}/systemvmtemplate-${CS_VERSION}.${CS_MINOR_VERSION}-vmware.ova"
81+
["xenserver"]="http://10.0.3.122/systemvmtemplate/custom/cks-debian/systemvmtemplate-$CS_VERSION.$CS_MINOR_VERSION-xen.vhd.bz2"
82+
["hyperv"]="http://10.0.3.122/systemvmtemplate/custom/cks-debian/$CS_VERSION/systemvmtemplate-$CS_VERSION.$CS_MINOR_VERSION-hyperv.vhd.zip"
83+
["lxc"]="http://10.0.3.122/systemvmtemplate/custom/cks-debian/$CS_VERSION/systemvmtemplate-$CS_VERSION.$CS_MINOR_VERSION-kvm.qcow2.bz2"
84+
["ovm3"]="http://10.0.3.122/systemvmtemplate/custom/cks-debian/$CS_VERSION/systemvmtemplate-$CS_VERSION.$CS_MINOR_VERSION-ovm.raw.bz2" )
7785

7886

7987
PARENTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )/dist/systemvm-templates/"

‎tools/appliance/systemvmtemplate/http/preseed.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ d-i partman-auto/expert_recipe string \
6969
256 1000 256 linux-swap \
7070
method{ swap } format{ } \
7171
. \
72-
2500 40 4000 ext4 \
72+
2240 40 4000 ext4 \
7373
method{ format } format{ } \
7474
use_filesystem{ } filesystem{ ext4 } \
7575
mountpoint{ / } \

‎tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ function install_packages() {
7777
sharutils genisoimage \
7878
strongswan libcharon-extra-plugins libstrongswan-extra-plugins strongswan-charon strongswan-starter \
7979
virt-what open-vm-tools qemu-guest-agent hyperv-daemons cloud-guest-utils \
80-
apt-transport-https ca-certificates curl gnupg gnupg-agent software-properties-common cloud-init
80+
apt-transport-https ca-certificates curl gnupg gnupg-agent software-properties-common
81+
82+
apt-get install -y python3-json-pointer python3-jsonschema cloud-init
8183

8284
apt-get -y autoremove --purge
8385
apt-get clean

‎tools/appliance/systemvmtemplate/template.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
"disk_size": 3000,
4444
"disk_interface": "virtio",
4545
"net_device": "virtio-net",
46-
"iso_url": "https://cdimage.debian.org/debian-cd/10.9.0/amd64/iso-cd/debian-10.9.0-amd64-netinst.iso",
47-
"iso_checksum": "47d35187b4903e803209959434fb8b65ead3ad2a8f007eef1c3d3284f356ab9955aa7e15e24cb7af6a3859aa66837f5fa2e7441f936496ea447904f7dddfdc20",
46+
"iso_url": "https://cdimage.debian.org/debian-cd/10.10.0/amd64/iso-cd/debian-10.10.0-amd64-netinst.iso",
47+
"iso_checksum": "87b4c9dd135718304a1b3e68423fe1b03ed52eb67f60563ad14a846aeaaecf53c064dae0f128b2633041992bbc8124b68b6767b529d80487754959b38558e637",
4848
"iso_checksum_type": "sha512",
4949
"output_directory": "../dist",
5050
"http_directory": "http",

0 commit comments

Comments
 (0)