You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2017/01/12 17:32:34 UTC
[1/2] git commit: updated refs/heads/master to 9513053
Repository: cloudstack
Updated Branches:
refs/heads/master 729ae6d18 -> 9513053f4
CLOUDSTACK-9710: Switch to JRE1.8
- Switches Travis to use jdk1.8
- Changes java-version to 1.8
- Change jdk/maven version to 1.8
- Switch to F5/java8 compatible library release
- Switch packaging to use jdk 1.8, and jre 1.8 in init/systemd scripts
- Switch systemvm to openjdk-8-jre
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e6cc78f5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e6cc78f5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e6cc78f5
Branch: refs/heads/master
Commit: e6cc78f531d0201aed004fd9e003a1ae2ab9a816
Parents: 729ae6d
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Jan 4 22:45:43 2017 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Jan 11 14:04:03 2017 +0530
----------------------------------------------------------------------
.java-version | 2 +-
.travis.yml | 2 +-
debian/control | 8 ++++----
.../service/NetworkOrchestrationService.java | 2 +-
packaging/build-deb.sh | 2 +-
packaging/centos63/cloud-agent.rc | 2 +-
packaging/centos63/cloud.spec | 8 ++++----
packaging/centos7/cloud-agent.rc | 2 +-
packaging/centos7/cloud.spec | 8 ++++----
packaging/debian/cloudstack-agent.init | 2 +-
packaging/debian/cloudstack-usage.init | 2 +-
packaging/debian/init/cloud-management | 2 +-
plugins/network-elements/f5/pom.xml | 6 +++++-
pom.xml | 2 +-
.../definitions/systemvmtemplate/apt_upgrade.sh | 8 +++++++-
.../definitions/systemvmtemplate/definition.rb | 4 ++--
.../install_systemvm_packages.sh | 19 +++++++++++++++----
.../definitions/systemvmtemplate/preseed.cfg | 4 ++--
tools/docker/Dockerfile | 4 ++--
19 files changed, 55 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6cc78f5/.java-version
----------------------------------------------------------------------
diff --git a/.java-version b/.java-version
index d3bdbdf..6259340 100644
--- a/.java-version
+++ b/.java-version
@@ -1 +1 @@
-1.7
+1.8
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6cc78f5/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index da81633..7d3aa85 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ sudo: required
dist: trusty
language: java
jdk:
-- oraclejdk7
+- oraclejdk8
python:
- "2.7"
cache:
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6cc78f5/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index 9855bed..157aa8d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: cloudstack
Section: libs
Priority: extra
Maintainer: Wido den Hollander <wi...@widodh.nl>
-Build-Depends: debhelper (>= 9), openjdk-8-jdk | java8-sdk | java8-jdk | openjdk-7-jdk, genisoimage,
+Build-Depends: debhelper (>= 9), openjdk-8-jdk | java8-sdk | java8-jdk, genisoimage,
python-mysql.connector, maven (>= 3) | maven3, python (>= 2.7), lsb-release, dh-systemd
Standards-Version: 3.8.1
Homepage: http://www.cloudstack.org/
@@ -15,14 +15,14 @@ Description: A common package which contains files which are shared by several C
Package: cloudstack-management
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, cloudstack-common (= ${source:Version}), tomcat6 | tomcat7, sudo, jsvc, python-mysql.connector, libmysql-java, augeas-tools, mysql-client, adduser, bzip2, ipmitool, lsb-release
+Depends: ${misc:Depends}, ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime, cloudstack-common (= ${source:Version}), tomcat6 | tomcat7, sudo, jsvc, python-mysql.connector, libmysql-java, augeas-tools, mysql-client, adduser, bzip2, ipmitool, lsb-release
Conflicts: cloud-server, cloud-client, cloud-client-ui
Description: CloudStack server library
The CloudStack management server
Package: cloudstack-agent
Architecture: all
-Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime | openjdk-7-jre-headless, cloudstack-common (= ${source:Version}), lsb-base (>= 4.0), libcommons-daemon-java, openssh-client, qemu-kvm (>= 1.0), libvirt-bin (>= 0.9.8), uuid-runtime, iproute, ebtables, vlan, jsvc, ipset, python-libvirt, ethtool, iptables, lsb-release
+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 (>= 0.9.8), uuid-runtime, iproute, ebtables, vlan, jsvc, ipset, python-libvirt, ethtool, iptables, lsb-release
Recommends: init-system-helpers
Conflicts: cloud-agent, cloud-agent-libs, cloud-agent-deps, cloud-agent-scripts
Description: CloudStack agent
@@ -32,7 +32,7 @@ Description: CloudStack agent
Package: cloudstack-usage
Architecture: all
-Depends: openjdk-8-jre-headless | java8-runtime-headless | java8-runtime | openjdk-7-jre-headless, cloudstack-common (= ${source:Version}), jsvc, libmysql-java
+Depends: openjdk-8-jre-headless | java8-runtime-headless | java8-runtime, cloudstack-common (= ${source:Version}), jsvc, libmysql-java
Recommends: init-system-helpers
Description: CloudStack usage monitor
The CloudStack usage monitor provides usage accounting across the entire cloud for
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6cc78f5/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java b/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
index a3f3a8c..442919e 100644
--- a/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
+++ b/engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
@@ -65,7 +65,7 @@ public interface NetworkOrchestrationService {
static final String NetworkThrottlingRateCK = "network.throttling.rate";
static final String MinVRVersionCK = "minreq.sysvmtemplate.version";
- static final ConfigKey<String> MinVRVersion = new ConfigKey<String>(String.class, MinVRVersionCK, "Advanced", "4.6.0",
+ static final ConfigKey<String> MinVRVersion = new ConfigKey<String>(String.class, MinVRVersionCK, "Advanced", "4.10.0",
"What version should the Virtual Routers report", true, ConfigKey.Scope.Zone, null);
static final ConfigKey<Integer> NetworkLockTimeout = new ConfigKey<Integer>(Integer.class, NetworkLockTimeoutCK, "Network", "600",
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6cc78f5/packaging/build-deb.sh
----------------------------------------------------------------------
diff --git a/packaging/build-deb.sh b/packaging/build-deb.sh
index 52af16a..448232d 100755
--- a/packaging/build-deb.sh
+++ b/packaging/build-deb.sh
@@ -37,7 +37,7 @@ set -e
# 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"
#
# Ubuntu 14.04
-# docker run -ti -v /tmp:/src ubuntu:14.04 /bin/bash -c "apt-get update && apt-get install -y dpkg-dev python debhelper openjdk-7-jdk genisoimage python-mysql.connector maven lsb-release devscripts dh-systemd python-setuptools && /src/cloudstack/packaging/build-deb.sh"
+# 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"
#
cd `dirname $0`
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6cc78f5/packaging/centos63/cloud-agent.rc
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud-agent.rc b/packaging/centos63/cloud-agent.rc
index aad9582..a41732a 100755
--- a/packaging/centos63/cloud-agent.rc
+++ b/packaging/centos63/cloud-agent.rc
@@ -49,7 +49,7 @@ unset OPTIONS
[ -r /etc/sysconfig/"$SHORTNAME" ] && source /etc/sysconfig/"$SHORTNAME"
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-7-openjdk-i386 /usr/lib/jvm/java-7-openjdk-amd64 /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun"
+JDK_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/java-1.8.0 /usr/lib/jvm/java-8-openjdk /usr/lib/jvm/java-8-openjdk-i386 /usr/lib/jvm/java-8-openjdk-amd64"
for jdir in $JDK_DIRS; do
if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6cc78f5/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 9556236..5670193 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -43,7 +43,7 @@ Group: System Environment/Libraries
Source0: %{name}-%{_maventag}.tgz
BuildRoot: %{_tmppath}/%{name}-%{_maventag}-%{release}-build
-BuildRequires: java-1.7.0-openjdk-devel
+BuildRequires: java-1.8.0-openjdk-devel
BuildRequires: tomcat6
BuildRequires: ws-commons-util
BuildRequires: jpackage-utils
@@ -60,7 +60,7 @@ intelligent IaaS cloud implementation.
%package management
Summary: CloudStack management server UI
Requires: tomcat6
-Requires: java-1.7.0-openjdk
+Requires: java-1.8.0-openjdk
Requires: python
Requires: bash
Requires: bzip2
@@ -113,7 +113,7 @@ The Apache CloudStack files shared between agent and management server
%package agent
Summary: CloudStack Agent for KVM hypervisors
Requires: openssh-clients
-Requires: java-1.7.0-openjdk
+Requires: java-1.8.0-openjdk
Requires: %{name}-common = %{_ver}
Requires: libvirt
Requires: bridge-utils
@@ -152,7 +152,7 @@ The CloudStack baremetal agent
%package usage
Summary: CloudStack Usage calculation server
-Requires: java-1.7.0-openjdk
+Requires: java-1.8.0-openjdk
Requires: jsvc
Requires: jakarta-commons-daemon
Requires: jakarta-commons-daemon-jsvc
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6cc78f5/packaging/centos7/cloud-agent.rc
----------------------------------------------------------------------
diff --git a/packaging/centos7/cloud-agent.rc b/packaging/centos7/cloud-agent.rc
index aad9582..91ceff6 100755
--- a/packaging/centos7/cloud-agent.rc
+++ b/packaging/centos7/cloud-agent.rc
@@ -49,7 +49,7 @@ unset OPTIONS
[ -r /etc/sysconfig/"$SHORTNAME" ] && source /etc/sysconfig/"$SHORTNAME"
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-7-openjdk-i386 /usr/lib/jvm/java-7-openjdk-amd64 /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun"
+JDK_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/java-1.8.0-openjdk /usr/lib/jvm/java-8-openjdk-i386 /usr/lib/jvm/java-8-openjdk-amd64"
for jdir in $JDK_DIRS; do
if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6cc78f5/packaging/centos7/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 7c093f9..00b5dbc 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -43,7 +43,7 @@ Group: System Environment/Libraries
Source0: %{name}-%{_maventag}.tgz
BuildRoot: %{_tmppath}/%{name}-%{_maventag}-%{release}-build
-BuildRequires: java-1.7.0-openjdk-devel
+BuildRequires: java-1.8.0-openjdk-devel
BuildRequires: tomcat => 7.0
BuildRequires: ws-commons-util
BuildRequires: jpackage-utils
@@ -60,7 +60,7 @@ intelligent IaaS cloud implementation.
%package management
Summary: CloudStack management server UI
Requires: tomcat => 7.0
-Requires: java => 1.7.0
+Requires: java => 1.8.0
Requires: python
Requires: bash
Requires: bzip2
@@ -99,7 +99,7 @@ The Apache CloudStack files shared between agent and management server
%package agent
Summary: CloudStack Agent for KVM hypervisors
Requires: openssh-clients
-Requires: java => 1.7.0
+Requires: java => 1.8.0
Requires: %{name}-common = %{_ver}
Requires: libvirt
Requires: bridge-utils
@@ -131,7 +131,7 @@ The CloudStack baremetal agent
%package usage
Summary: CloudStack Usage calculation server
-Requires: java => 1.7.0
+Requires: java => 1.8.0
Requires: mysql-connector-java
Group: System Environment/Libraries
%description usage
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6cc78f5/packaging/debian/cloudstack-agent.init
----------------------------------------------------------------------
diff --git a/packaging/debian/cloudstack-agent.init b/packaging/debian/cloudstack-agent.init
index 0cae5f5..2610779 100755
--- a/packaging/debian/cloudstack-agent.init
+++ b/packaging/debian/cloudstack-agent.init
@@ -50,7 +50,7 @@ unset OPTIONS
mkdir -m 0755 -p "$TMP"
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-7-openjdk-amd64 /usr/lib/jvm/java-7-openjdk-i386 /usr/lib/jvm/java-7-oracle /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun"
+JDK_DIRS="/usr/lib/jvm/java-8-openjdk-amd64 /usr/lib/jvm/java-8-openjdk-i386 /usr/lib/jvm/java-8-oracle"
for jdir in $JDK_DIRS; do
if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6cc78f5/packaging/debian/cloudstack-usage.init
----------------------------------------------------------------------
diff --git a/packaging/debian/cloudstack-usage.init b/packaging/debian/cloudstack-usage.init
index e6129c2..0517450 100755
--- a/packaging/debian/cloudstack-usage.init
+++ b/packaging/debian/cloudstack-usage.init
@@ -64,7 +64,7 @@ setJavaHome() {
# If everything has failed, try hardcoded paths
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
- JDK_DIRS="/usr/lib/jvm/java-7-openjdk-amd64 /usr/lib/jvm/java-7-openjdk-i386 /usr/lib/jvm/java-7-oracle /usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-7-sun"
+ JDK_DIRS="/usr/lib/jvm/java-8-openjdk-amd64 /usr/lib/jvm/java-8-openjdk-i386 /usr/lib/jvm/java-8-oracle /usr/lib/jvm/java-8-openjdk"
for jdir in $JDK_DIRS; do
if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
JAVA_HOME="$jdir"
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6cc78f5/packaging/debian/init/cloud-management
----------------------------------------------------------------------
diff --git a/packaging/debian/init/cloud-management b/packaging/debian/init/cloud-management
index 90052c9..05c38be 100755
--- a/packaging/debian/init/cloud-management
+++ b/packaging/debian/init/cloud-management
@@ -65,7 +65,7 @@ TOMCAT6_USER=tomcat6
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
# defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-7-openjdk-amd64 /usr/lib/jvm/java-7-openjdk-i386 /usr/lib/jvm/java-7-oracle /usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-7-sun"
+JDK_DIRS="/usr/lib/jvm/java-8-openjdk-amd64 /usr/lib/jvm/java-8-openjdk-i386 /usr/lib/jvm/java-8-oracle /usr/lib/jvm/java-8-openjdk"
# Look for the right JVM to use
for jdir in $JDK_DIRS; do
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6cc78f5/plugins/network-elements/f5/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/f5/pom.xml b/plugins/network-elements/f5/pom.xml
index 56889a2..048619b 100644
--- a/plugins/network-elements/f5/pom.xml
+++ b/plugins/network-elements/f5/pom.xml
@@ -28,9 +28,13 @@
</parent>
<dependencies>
<dependency>
+ <groupId>org.apache.axis</groupId>
+ <artifactId>axis-jaxrpc</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.cloud.com.f5</groupId>
<artifactId>icontrol</artifactId>
- <version>1.0</version>
+ <version>12.1</version>
</dependency>
<dependency>
<groupId>org.apache.axis</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6cc78f5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 73f6e7c..7ad2ff8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
</issueManagement>
<properties>
- <cs.jdk.version>1.7</cs.jdk.version>
+ <cs.jdk.version>1.8</cs.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6cc78f5/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh b/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh
index 0116f99..f98c6b5 100644
--- a/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh
+++ b/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh
@@ -20,6 +20,8 @@ set -e
set -x
function add_backports() {
+ sed -i '/cdrom/d' /etc/apt/sources.list
+ sed -i '/deb-src/d' /etc/apt/sources.list
sed -i '/backports/d' /etc/apt/sources.list
echo 'deb http://http.debian.net/debian wheezy-backports main' >> /etc/apt/sources.list
}
@@ -30,9 +32,13 @@ function apt_upgrade() {
add_backports
- apt-get clean
+ rm -fv /root/*.iso
+ apt-get -y autoremove
+ apt-get autoclean
apt-get -q -y --force-yes update
apt-get -q -y --force-yes upgrade
+
+ df -h
}
return 2>/dev/null || apt_upgrade
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6cc78f5/tools/appliance/definitions/systemvmtemplate/definition.rb
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb b/tools/appliance/definitions/systemvmtemplate/definition.rb
index db6fce8..e0c44e2 100644
--- a/tools/appliance/definitions/systemvmtemplate/definition.rb
+++ b/tools/appliance/definitions/systemvmtemplate/definition.rb
@@ -42,7 +42,7 @@ architectures = {
config = {
:cpu_count => '1',
:memory_size => '256',
- :disk_size => '3000', :disk_format => 'VDI', :hostiocache => 'off',
+ :disk_size => '3200', :disk_format => 'VDI', :hostiocache => 'off',
:iso_download_timeout => '1200',
:boot_wait => '10',
:boot_cmd_sequence => [
@@ -71,7 +71,7 @@ config = {
:ssh_key => '',
:ssh_host_port => '7222',
:ssh_guest_port => '22',
- :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
+ :sudo_cmd => "echo '%p'|sudo -S bash '%f'",
:shutdown_cmd => 'halt -p',
:postinstall_files => [
# basic minimal vm creation
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6cc78f5/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh b/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh
index 491ac74..f390821 100644
--- a/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh
+++ b/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh
@@ -32,11 +32,12 @@ function debconf_packages() {
echo "openswan openswan/install_x509_certificate seen true" | debconf-set-selections
echo "iptables-persistent iptables-persistent/autosave_v4 boolean true" | debconf-set-selections
echo "iptables-persistent iptables-persistent/autosave_v6 boolean true" | debconf-set-selections
+ echo "libc6 libraries/restart-without-asking boolean false" | debconf-set-selections
}
function install_packages() {
- DEBIAN_FRONTEND=noninteractive
- DEBIAN_PRIORITY=critical
+ export DEBIAN_FRONTEND=noninteractive
+ export DEBIAN_PRIORITY=critical
local arch=`dpkg --print-architecture`
debconf_packages
@@ -67,7 +68,6 @@ function install_packages() {
xenstore-utils libxenstore3.0 \
conntrackd ipvsadm libnetfilter-conntrack3 libnl-3-200 libnl-genl-3-200 \
ipcalc \
- openjdk-7-jre-headless \
iptables-persistent \
libtcnative-1 libssl-dev libapr1-dev \
python-flask \
@@ -89,10 +89,21 @@ function install_packages() {
dpkg -i hv-kvp-daemon_3.1_amd64.deb
rm -f hv-kvp-daemon_3.1_amd64.deb
# XS tools
- wget https://raw.githubusercontent.com/bhaisaab/cloudstack-nonoss/master/xe-guest-utilities_6.5.0_amd64.deb
+ wget --no-check-certificate https://raw.githubusercontent.com/rhtyd/cloudstack-nonoss/master/xe-guest-utilities_6.5.0_amd64.deb
+ md5sum xe-guest-utilities_6.5.0_amd64.deb
dpkg -i xe-guest-utilities_6.5.0_amd64.deb
rm -f xe-guest-utilities_6.5.0_amd64.deb
fi
+
+ # Install OpenJDK8 pkgs maintained by Azul
+ apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9
+ echo 'deb http://repos.azulsystems.com/debian stable main' > /etc/apt/sources.list.d/zulu.list
+ apt-get -y autoremove
+ apt-get autoclean
+ apt-get clean
+ apt-get update
+ ${apt_get} install zulu-8
+ java -version
}
return 2>/dev/null || install_packages
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6cc78f5/tools/appliance/definitions/systemvmtemplate/preseed.cfg
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/preseed.cfg b/tools/appliance/definitions/systemvmtemplate/preseed.cfg
index 2127090..77402d7 100644
--- a/tools/appliance/definitions/systemvmtemplate/preseed.cfg
+++ b/tools/appliance/definitions/systemvmtemplate/preseed.cfg
@@ -60,7 +60,7 @@ d-i partman-auto/expert_recipe string \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /home } \
. \
- 800 60 1400 ext4 \
+ 1000 60 1400 ext4 \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /usr } \
@@ -75,7 +75,7 @@ d-i partman-auto/expert_recipe string \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /var } \
. \
- 200 50 500 ext4 \
+ 400 50 500 ext4 \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /var/log } \
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6cc78f5/tools/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index da4c6da..9939a91 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -22,13 +22,13 @@ FROM ubuntu:14.04
MAINTAINER "Apache CloudStack" <de...@cloudstack.apache.org>
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.10.0.0-SNAPSHOT"
-RUN apt-get -y update && apt-get install -y \
+RUN add-apt-repository -y ppa:openjdk-r/ppa && apt-get -y update && apt-get install -y \
genisoimage \
libffi-dev \
libssl-dev \
git \
maven \
- openjdk-7-jdk \
+ openjdk-8-jdk \
python-dev \
python-setuptools \
python-pip \
[2/2] git commit: updated refs/heads/master to 9513053
Posted by bh...@apache.org.
Merge pull request #1888 from shapeblue/jre8-only
CLOUDSTACK-9710: Switch to JRE1.8
- Switches Travis to use jdk1.8
- Changes java-version to 1.8
- Change jdk/maven version to 1.8
- Switch to F5/java8 compatible library release
- Switch packaging to use jdk 1.8, and jre 1.8 in init/systemd scripts
- Switch systemvm to openjdk-8-jre
* pr/1888:
CLOUDSTACK-9710: Switch to JRE1.8
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9513053f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9513053f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9513053f
Branch: refs/heads/master
Commit: 9513053f4256375e892df27d0c26644d1fe41725
Parents: 729ae6d e6cc78f
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Jan 12 22:59:50 2017 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Jan 12 23:02:05 2017 +0530
----------------------------------------------------------------------
.java-version | 2 +-
.travis.yml | 2 +-
debian/control | 8 ++++----
.../service/NetworkOrchestrationService.java | 2 +-
packaging/build-deb.sh | 2 +-
packaging/centos63/cloud-agent.rc | 2 +-
packaging/centos63/cloud.spec | 8 ++++----
packaging/centos7/cloud-agent.rc | 2 +-
packaging/centos7/cloud.spec | 8 ++++----
packaging/debian/cloudstack-agent.init | 2 +-
packaging/debian/cloudstack-usage.init | 2 +-
packaging/debian/init/cloud-management | 2 +-
plugins/network-elements/f5/pom.xml | 6 +++++-
pom.xml | 2 +-
.../definitions/systemvmtemplate/apt_upgrade.sh | 8 +++++++-
.../definitions/systemvmtemplate/definition.rb | 4 ++--
.../install_systemvm_packages.sh | 19 +++++++++++++++----
.../definitions/systemvmtemplate/preseed.cfg | 4 ++--
tools/docker/Dockerfile | 4 ++--
19 files changed, 55 insertions(+), 34 deletions(-)
----------------------------------------------------------------------