openstack/devstack
Code Issues Proposed changes

Merge "Remove Ubuntu 14.10 as supported distribution"

Browse Source
This commit is contained in:
Jenkins 2015-11-03 15:16:04 +00:00 committed by Gerrit Code Review
commit c9f6f11265
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nova_plugins/functions-libvirt
View File

@ -23,7 +23,7 @@ DEBUG_LIBVIRT=$(trueorfalse True DEBUG_LIBVIRT)
# Installs required distro-specific libvirt packages. # Installs required distro-specific libvirt packages.
function install_libvirt { function install_libvirt {
if is_ubuntu; then if is_ubuntu; then
if is_arch "aarch64" && [[ ${DISTRO} =~ (trusty|utopic) ]]; then if is_arch "aarch64" && [[ ${DISTRO} == "trusty" ]]; then
install_package qemu-system install_package qemu-system
else else
install_package qemu-kvm install_package qemu-kvm

2
stack.sh
View File

@ -178,7 +178,7 @@ source $TOP_DIR/stackrc
# Warn users who aren't on an explicitly supported distro, but allow them to # Warn users who aren't on an explicitly supported distro, but allow them to
# override check and attempt installation with ``FORCE=yes ./stack`` # override check and attempt installation with ``FORCE=yes ./stack``
if [[ ! ${DISTRO} =~ (precise|trusty|utopic|vivid|7.0|wheezy|sid|testing|jessie|f21|f22|rhel7) ]]; then if [[ ! ${DISTRO} =~ (precise|trusty|vivid|7.0|wheezy|sid|testing|jessie|f21|f22|rhel7) ]]; then
echo "WARNING: this script has not been tested on $DISTRO" echo "WARNING: this script has not been tested on $DISTRO"
if [[ "$FORCE" != "yes" ]]; then if [[ "$FORCE" != "yes" ]]; then
die $LINENO "If you wish to run this script anyway run with FORCE=yes" die $LINENO "If you wish to run this script anyway run with FORCE=yes"