Skip to content

CLOUDSTACK-10341: Reduce systemvmtemplate size, install nftables #2506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 5 commits into from
Mar 28, 2018
Merged

CLOUDSTACK-10341: Reduce systemvmtemplate size, install nftables #2506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1215ed4
CLOUDSTACK-10341: Reduce template size, install nft
yadvr Mar 22, 2018
e8fa1cc
Fix bug that fails to patch with provided release version
yadvr Mar 23, 2018
ecece1b
Fix failure in one of the smoke tests, FAULT is not an acceptable sta…
yadvr Mar 23, 2018
50d14d5
Fix failing integration test
yadvr Mar 23, 2018
a7d33a7
size fixes
yadvr Mar 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions test/integration/smoke/test_vpc_redundant.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,8 @@ def wait_for_vrrp(self):
time.sleep(3 * self.advert_int + 5)

def check_routers_state(self,count=2, status_to_check="MASTER", expected_count=1, showall=False):
vals = ["MASTER", "BACKUP", "UNKNOWN"]
cnts = [0, 0, 0]
vals = ["MASTER", "BACKUP", "UNKNOWN", "FAULT"]
cnts = [0, 0, 0, 0]

self.wait_for_vrrp()

Expand Down Expand Up @@ -612,7 +612,8 @@ def test_04_rvpc_network_garbage_collector_nics(self):

time.sleep(total_sleep * 3)

self.check_routers_state(status_to_check="BACKUP", expected_count=2)
# Router will be in FAULT state, i.e. keepalived is stopped
self.check_routers_state(status_to_check="FAULT", expected_count=2)
self.start_vm()
self.check_routers_state(status_to_check="MASTER")

Expand Down
2 changes: 1 addition & 1 deletion tools/appliance/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ function create_definition() {
set +e
if [ ! -z "${version}" ]; then
sed ${sed_regex_option} -i -e "s/^CLOUDSTACK_RELEASE=.+/CLOUDSTACK_RELEASE=${version}/" \
"${appliance_build_name}/configure_systemvm_services.sh"
"${appliance_build_name}/scripts/configure_systemvm_services.sh"
fi
set -e
add_on_exit rm -rf "${appliance_build_name}"
Expand Down
10 changes: 5 additions & 5 deletions tools/appliance/systemvmtemplate/http/preseed.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,28 +54,28 @@ d-i partman-auto/disk string /dev/vda
d-i partman-auto/method string regular
d-i partman-auto/expert_recipe string \
boot-root :: \
80 50 160 ext2 \
60 60 60 ext2 \
$primary{ } $bootable{ } \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext2 } \
mountpoint{ /boot } \
. \
1200 40 1600 ext4 \
975 40 1000 ext4 \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ / } \
. \
800 60 800 ext4 \
480 50 700 ext4 \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /var } \
. \
100 90 200 ext4 \
80 90 100 ext4 \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /tmp } \
. \
256 100 1024 linux-swap \
256 1000 256 linux-swap \
method{ swap } format{ } \
.

Expand Down
3 changes: 1 addition & 2 deletions tools/appliance/systemvmtemplate/scripts/apt_upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ set -x
function fix_tune2fs() {
for partition in $(blkid -o list | grep ext | awk '{print $1}')
do
tune2fs -m 1 $partition
tune2fs -m 0 $partition
tune2fs -c 3 $partition
done
fdisk -l
Expand Down Expand Up @@ -55,7 +55,6 @@ function apt_upgrade() {
apt-get -q -y update
apt-get -q -y upgrade
apt-get -q -y dist-upgrade
apt-get -y remove --purge linux-image-4.9.0-4-amd64
apt-get -y autoremove --purge
apt-get autoclean
apt-get clean
Expand Down
2 changes: 2 additions & 0 deletions tools/appliance/systemvmtemplate/scripts/cleanup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,15 @@ function cleanup_misc() {
# Docs and data files
rm -fr /var/lib/apt/*
rm -fr /var/cache/apt/*
rm -fr /var/cache/debconf/*old
rm -fr /usr/share/doc
rm -fr /usr/share/man
rm -fr /usr/share/info
rm -fr /usr/share/lintian
rm -fr /usr/share/apache2/icons
find /usr/share/locale -type f | grep -v en_US | xargs rm -fr
find /usr/share/zoneinfo -type f | grep -v UTC | xargs rm -fr
rm -fr /tmp/*
}

function cleanup() {
Expand Down
4 changes: 3 additions & 1 deletion tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,11 @@ function install_packages() {
strongswan libcharon-extra-plugins libstrongswan-extra-plugins \
virt-what open-vm-tools qemu-guest-agent hyperv-daemons

apt-get -q -y -t stretch-backports install nftables

apt-get -y autoremove --purge
apt-get autoclean
apt-get clean
apt-get autoclean

#32 bit architecture support:: not required for 32 bit template
if [ "${arch}" != "i386" ]; then
Expand Down
2 changes: 1 addition & 1 deletion tools/appliance/systemvmtemplate/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
[ "-m", "512M" ],
[ "-smp", "cpus=1,maxcpus=1,cores=1" ]
],
"disk_size": 2400,
"disk_size": 1800,
"format": "qcow2",

"disk_interface": "virtio",
Expand Down