openstack/devstack
Code Issues Proposed changes

Merge "Switch to lioadm for centos cinder"

Browse Source
This commit is contained in:
Jenkins 2017-06-28 23:22:30 +00:00 committed by Gerrit Code Review
commit 66109302ab
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
files/rpms/cinder
View File

@ -1,4 +1,5 @@
iscsi-initiator-utils iscsi-initiator-utils
lvm2 lvm2
qemu-img qemu-img
scsi-target-utils # NOPRIME scsi-target-utils # not:rhel7,f24,f25 NOPRIME
targetcli # dist:rhel7,f24,f25 NOPRIME

17
lib/cinder
View File

@ -95,7 +95,16 @@ CINDER_VOLUME_CLEAR=$(echo ${CINDER_VOLUME_CLEAR} | tr '[:upper:]' '[:lower:]')
# https://bugs.launchpad.net/cinder/+bug/1180976 # https://bugs.launchpad.net/cinder/+bug/1180976
CINDER_PERIODIC_INTERVAL=${CINDER_PERIODIC_INTERVAL:-60} CINDER_PERIODIC_INTERVAL=${CINDER_PERIODIC_INTERVAL:-60}
# Centos7 switched to using LIO and that's all that's supported,
# although the tgt bits are in EPEL we don't want that for CI
if is_fedora; then
CINDER_ISCSI_HELPER=${CINDER_ISCSI_HELPER:-lioadm}
if [[ ${CINDER_ISCSI_HELPER} != "lioadm" ]]; then
die "lioadm is the only valid Cinder iscsi_helper config on this platform"
fi
else
CINDER_ISCSI_HELPER=${CINDER_ISCSI_HELPER:-tgtadm} CINDER_ISCSI_HELPER=${CINDER_ISCSI_HELPER:-tgtadm}
fi
# Toggle for deploying Cinder under HTTPD + mod_wsgi # Toggle for deploying Cinder under HTTPD + mod_wsgi
CINDER_USE_MOD_WSGI=${CINDER_USE_MOD_WSGI:-False} CINDER_USE_MOD_WSGI=${CINDER_USE_MOD_WSGI:-False}
@ -435,12 +444,10 @@ function init_cinder {
function install_cinder { function install_cinder {
git_clone $CINDER_REPO $CINDER_DIR $CINDER_BRANCH git_clone $CINDER_REPO $CINDER_DIR $CINDER_BRANCH
setup_develop $CINDER_DIR setup_develop $CINDER_DIR
if [ "$CINDER_ISCSI_HELPER" = "tgtadm" ]; then if [[ "$CINDER_ISCSI_HELPER" == "tgtadm" ]]; then
if is_fedora; then
install_package scsi-target-utils
else
install_package tgt install_package tgt
fi elif [[ "$CINDER_ISCI_HELPER" == "lioadm" ]]; then
install_package targetcli
fi fi
if [ "$CINDER_USE_MOD_WSGI" == "True" ]; then if [ "$CINDER_USE_MOD_WSGI" == "True" ]; then