openstack/bifrost
Code Issues Proposed changes

Improve distribution detection in create_vm_nodes-for-role.sh

Browse Source 
Move distribution detection code into a function and query the
/etc/os-release file which should exist on all recent distributions. If
that fails, use the old method instead. Finally, we add support for
SUSE based distributions.

Change-Id: I34fc704fc79d1ad130f716007c5cf704772ac6e6
Signed-off-by: Markos Chandras <mchandras@suse.de>
This commit is contained in:
Markos Chandras 2016-08-31 08:39:26 +01:00
parent 33afbb5aae
commit 9c3b203644
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
playbooks/roles/bifrost-create-vm-nodes/files/create_vm_nodes-for-role.sh
View File

@ -47,10 +47,21 @@ VM_RAM=${VM_RAM:-3072}
VM_DISK=${VM_DISK:-10} VM_DISK=${VM_DISK:-10}
VM_MACHINE="pc-1.0" VM_MACHINE="pc-1.0"
function is_distro {
local os_release=false
[[ -e /etc/os-release ]] && os_release=true
case "$1" in
centos) { $os_release && grep -q -i "centos" /etc/os-release; } || [[ -e /etc/centos-release ]] ;;
debian) { $os_release && grep -q -i "debian" /etc/os-release; } || [[ -e /etc/debian_version ]] ;;
suse) { $os_release && grep -q -i "suse" /etc/os-release; } || [[ -e /etc/SuSE-release ]] ;;
*) echo "Unsupported distribution '$1'" >&2; exit 1 ;;
esac
}
# CentOS provides a single emulator package # CentOS provides a single emulator package
# which differs from other distributions, and # which differs from other distributions, and
# needs to be explicitly set. # needs to be explicitly set.
if [ -e /etc/centos-release ]; then if is_distro "centos"; then
VM_EMULATOR=/usr/libexec/qemu-kvm VM_EMULATOR=/usr/libexec/qemu-kvm
VM_MACHINE="pc" VM_MACHINE="pc"
fi fi
@ -113,7 +124,7 @@ function create_node {
if [ -n "$LOGDIR" ] ; then if [ -n "$LOGDIR" ] ; then
mkdir -p "$LOGDIR" mkdir -p "$LOGDIR"
if [ -e /etc/centos-release ]; then if is_distro "centos" || is_distro "suse"; then
# NOTE(TheJulia): For some unknown reason, libvirt's log folder # NOTE(TheJulia): For some unknown reason, libvirt's log folder
# permissions on CentOS ship in an inoperable state. Users must # permissions on CentOS ship in an inoperable state. Users must
# be able to read a folder to open files in the folder structure. # be able to read a folder to open files in the folder structure.
@ -122,7 +133,7 @@ function create_node {
fi fi
PREALLOC= PREALLOC=
if [ -f /etc/debian_version ]; then if is_distro "debian"; then
PREALLOC="--prealloc-metadata" PREALLOC="--prealloc-metadata"
fi fi
@ -140,7 +151,7 @@ function create_node {
# NOTE(TheJulia): CentOS default installs with an XFS root, and chattr # NOTE(TheJulia): CentOS default installs with an XFS root, and chattr
# fails to set +C on XFS. This could be more elegant, however the use # fails to set +C on XFS. This could be more elegant, however the use
# case is for CI testing. # case is for CI testing.
if [ ! -e /etc/centos-release ]; then if ! is_distro "centos"; then
chattr +C "$volume_path" || true chattr +C "$volume_path" || true
fi fi
vm_xml=" vm_xml="