Skip to content

Commit 7313a5e

Browse files
widoyadvr
authored andcommitted
deb: Remove Ubuntu 14.04 LTS support and update DEB dependencies (#2828)
Ubuntu 14.04 will go EOL in April 2019. With a new CloudStack release close to that date we can drop support for this Ubuntu version and the master branch of CloudStack. Ubuntu 16.04 (Xenial) and 18.04 (Bionic) both have systemd and more recent Java versions which make it easier to run the CloudStack KVM Agent on them. In addition libvirt and Qemu are more up to date with features which allow VMs to run better. Yet to be implemented features in KVM can also leverage the newer version of Qemu and libvirt without the need of taking older version of them into account. Signed-off-by: Wido den Hollander <wido@widodh.nl>
1 parent 0b6eafc commit 7313a5e

10 files changed

Lines changed: 5 additions & 507 deletions

.travis.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,3 @@ jobs:
215215
env: IMAGE=khos2ow/cloudstack-deb-builder:ubuntu1604 PARAMS=""
216216
<<: *package_job
217217

218-
- stage: package
219-
services: docker
220-
env: IMAGE=khos2ow/cloudstack-deb-builder:ubuntu1404 PARAMS=""
221-
<<: *package_job
222-

debian/cloudstack-agent.install

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
/etc/default/cloudstack-agent
2222
/etc/profile.d/cloudstack-agent-profile.sh
2323
/etc/logrotate.d/cloudstack-agent
24-
/etc/init.d/cloudstack-agent
2524
/usr/bin/cloudstack-setup-agent
2625
/usr/bin/cloudstack-ssh
2726
/usr/bin/cloudstack-agent-upgrade

debian/cloudstack-management.install

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
/etc/cloudstack/management/java.security.ciphers
2323
/etc/cloudstack/management/log4j-cloud.xml
2424
/etc/default/cloudstack-management
25-
/etc/init.d/cloudstack-management
2625
/etc/security/limits.d/cloudstack-limits.conf
2726
/etc/sudoers.d/cloudstack
2827
/var/cache/cloudstack/management

debian/cloudstack-usage.install

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,5 @@
1717

1818
/usr/share/cloudstack-usage/lib/*
1919
/usr/share/cloudstack-usage/plugins
20-
/etc/init.d/cloudstack-usage
2120
/etc/cloudstack/usage/*
2221
/etc/default/cloudstack-usage

debian/control

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Source: cloudstack
22
Section: libs
33
Priority: extra
44
Maintainer: Wido den Hollander <wido@widodh.nl>
5-
Build-Depends: debhelper (>= 9), openjdk-8-jdk | java8-sdk | java8-jdk, genisoimage,
5+
Build-Depends: debhelper (>= 9), openjdk-8-jdk | java8-sdk | java8-jdk | openjdk-9-jdk, genisoimage,
66
python-mysql.connector, maven (>= 3) | maven3, python (>= 2.7), lsb-release, dh-systemd, python-setuptools
77
Standards-Version: 3.8.1
88
Homepage: http://www.cloudstack.org/
@@ -15,14 +15,14 @@ Description: A common package which contains files which are shared by several C
1515

1616
Package: cloudstack-management
1717
Architecture: all
18-
Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime, cloudstack-common (= ${source:Version}), sudo, jsvc, python-mysql.connector, libmysql-java, augeas-tools, mysql-client, adduser, bzip2, ipmitool, lsb-release, init-system-helpers (>= 1.14~)
18+
Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime | openjdk-9-jre-headless, cloudstack-common (= ${source:Version}), sudo, python-mysql.connector, libmysql-java, augeas-tools, mysql-client, adduser, bzip2, ipmitool, lsb-release, init-system-helpers (>= 1.14~)
1919
Conflicts: cloud-server, cloud-client, cloud-client-ui
2020
Description: CloudStack server library
2121
The CloudStack management server
2222

2323
Package: cloudstack-agent
2424
Architecture: all
25-
Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime, cloudstack-common (= ${source:Version}), lsb-base (>= 4.0), libcommons-daemon-java, openssh-client, qemu-kvm (>= 1.0), libvirt-bin (>= 1.2.2), uuid-runtime, iproute2, ebtables, vlan, jsvc, ipset, python-libvirt, ethtool, iptables, lsb-release, init-system-helpers (>= 1.14~), aria2
25+
Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime | openjdk-9-jre-headless, cloudstack-common (= ${source:Version}), lsb-base (>= 9), libcommons-daemon-java, openssh-client, qemu-kvm (>= 2.5), libvirt-bin (>= 1.3), uuid-runtime, iproute2, ebtables, vlan, ipset, python-libvirt, ethtool, iptables, lsb-release, aria2
2626
Recommends: init-system-helpers
2727
Conflicts: cloud-agent, cloud-agent-libs, cloud-agent-deps, cloud-agent-scripts
2828
Description: CloudStack agent
@@ -32,7 +32,7 @@ Description: CloudStack agent
3232

3333
Package: cloudstack-usage
3434
Architecture: all
35-
Depends: openjdk-8-jre-headless | java8-runtime-headless | java8-runtime, cloudstack-common (= ${source:Version}), jsvc, libmysql-java, init-system-helpers (>= 1.14~)
35+
Depends: openjdk-8-jre-headless | java8-runtime-headless | java8-runtime | openjdk-9-jre-headless, cloudstack-common (= ${source:Version}), libmysql-java, init-system-helpers
3636
Description: CloudStack usage monitor
3737
The CloudStack usage monitor provides usage accounting across the entire cloud for
3838
cloud operators to charge based on usage parameters.

debian/rules

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ override_dh_auto_clean:
2525
override_dh_auto_install:
2626
# Common packages
2727
mkdir -p $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)
28-
mkdir -p $(DESTDIR)/$(SYSCONFDIR)/init.d
2928
mkdir -p $(DESTDIR)/$(SYSCONFDIR)/default
3029

3130
mkdir -p $(DESTDIR)/var/cache/$(PACKAGE)
@@ -43,7 +42,6 @@ override_dh_auto_install:
4342
install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-$(VERSION).jar $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/
4443
install -D plugins/hypervisors/kvm/target/dependencies/* $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/
4544

46-
install -m0755 packaging/debian/$(PACKAGE)-agent.init $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-agent
4745
install -d -m0755 debian/$(PACKAGE)-agent/lib/systemd/system
4846
# Fix libvirt service name for Debian/Ubuntu
4947
sed -i 's/Requires=libvirtd.service/Requires=libvirt-bin.service/g' packaging/systemd/$(PACKAGE)-agent.service
@@ -85,7 +83,6 @@ override_dh_auto_install:
8583
mv $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/server/cloudstack-sudoers $(DESTDIR)/$(SYSCONFDIR)/sudoers.d/$(PACKAGE)
8684
chmod 0440 $(DESTDIR)/$(SYSCONFDIR)/sudoers.d/$(PACKAGE)
8785

88-
install -D packaging/debian/init/cloud-management $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-management
8986
install -D client/target/utilities/bin/cloud-update-xenserver-licenses $(DESTDIR)/usr/bin/cloudstack-update-xenserver-licenses
9087
# Remove configuration in /ur/share/cloudstack-management/webapps/client/WEB-INF
9188
# This should all be in /etc/cloudstack/management
@@ -130,7 +127,6 @@ override_dh_auto_install:
130127
cp usage/target/transformed/db.properties $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage/
131128
cp usage/target/transformed/log4j-cloud_usage.xml $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage/log4j-cloud.xml
132129

133-
install -D -m0755 packaging/debian/$(PACKAGE)-usage.init $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-usage
134130
install -d -m0755 debian/$(PACKAGE)-usage/lib/systemd/system
135131
install -m0644 packaging/systemd/$(PACKAGE)-usage.service debian/$(PACKAGE)-usage/lib/systemd/system/$(PACKAGE)-usage.service
136132
install -m0644 packaging/systemd/$(PACKAGE)-usage.default $(DESTDIR)/$(SYSCONFDIR)/default/$(PACKAGE)-usage
@@ -143,9 +139,6 @@ override_dh_auto_install:
143139
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-integration-tests
144140
cp -r test/integration/* $(DESTDIR)/usr/share/$(PACKAGE)-integration-tests/
145141

146-
override_dh_installinit:
147-
dh_installinit -pcloudstack-management -pcloudstack-agent -pcloudstack-usage --onlyscripts --no-start
148-
149142
override_dh_systemd_enable:
150143
dh_systemd_enable -pcloudstack-management -pcloudstack-agent -pcloudstack-usage
151144

packaging/build-deb.sh

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,7 @@ set -e
2121
#
2222
# This script builds Debian packages for CloudStack and does
2323
# so by altering the debian/changelog file and add the Ubuntu
24-
# version as a suffix, for example: 4.9.0~xenial
25-
#
26-
# To build packages for Ubuntu 14.04 run this script on a
27-
# 14.04 system. The same goes for Ubuntu 16.04
28-
#
29-
# The biggest difference between those two versions is the
30-
# sysvinit vs systemd and Java 7 vs Java 8
24+
# version as a suffix, for example: 4.10.0~xenial
3125
#
3226
# These packages can be build using Docker for example:
3327
#
@@ -36,9 +30,6 @@ set -e
3630
# Ubuntu 16.04
3731
# docker run -ti -v /tmp:/src ubuntu:16.04 /bin/bash -c "apt-get update && apt-get install -y dpkg-dev python debhelper openjdk-8-jdk genisoimage python-mysql.connector maven lsb-release devscripts dh-systemd python-setuptools && /src/cloudstack/packaging/build-deb.sh"
3832
#
39-
# Ubuntu 14.04
40-
# docker run -ti -v /tmp:/src ubuntu:14.04 /bin/bash -c "apt-get update && apt-get install -y dpkg-dev python debhelper openjdk-8-jdk genisoimage python-mysql.connector maven lsb-release devscripts dh-systemd python-setuptools && /src/cloudstack/packaging/build-deb.sh"
41-
#
4233

4334
function usage() {
4435
cat << USAGE

packaging/debian/cloudstack-agent.init

Lines changed: 0 additions & 174 deletions
This file was deleted.

0 commit comments

Comments
 (0)