Merge "Change the openvz driver compute_driver entry to match all other compute drivers in nova."
diff --git a/.gitignore b/.gitignore
index f9e2644..798b081 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
*.pem
accrc
.stackenv
+.prereqs
diff --git a/files/apts/nova b/files/apts/nova
index 39b4060..f4615c4 100644
--- a/files/apts/nova
+++ b/files/apts/nova
@@ -8,7 +8,6 @@
python-mysqldb
python-xattr # needed for glance which is needed for nova --- this shouldn't be here
python-lxml # needed for glance which is needed for nova --- this shouldn't be here
-kvm
gawk
iptables
ebtables
@@ -19,6 +18,7 @@
libjs-jquery-tablesorter # Needed for coverage html reports
vlan
curl
+genisoimage # required for config_drive
rabbitmq-server # NOPRIME
qpidd # dist:precise NOPRIME
socat # used by ajaxterm
diff --git a/files/rpms/nova b/files/rpms/nova
index 568ee7f..7ff926b 100644
--- a/files/rpms/nova
+++ b/files/rpms/nova
@@ -3,6 +3,7 @@
dnsmasq-utils # for dhcp_release
ebtables
gawk
+genisoimage # required for config_drive
iptables
iputils
kpartx
diff --git a/functions b/functions
index b94c611..11f7d50 100644
--- a/functions
+++ b/functions
@@ -117,20 +117,32 @@
}
+function _get_package_dir() {
+ local pkg_dir
+ if is_ubuntu; then
+ pkg_dir=$FILES/apts
+ elif is_fedora; then
+ pkg_dir=$FILES/rpms
+ elif is_suse; then
+ pkg_dir=$FILES/rpms-suse
+ else
+ exit_distro_not_supported "list of packages"
+ fi
+ echo "$pkg_dir"
+}
+
# get_packages() collects a list of package names of any type from the
# prerequisite files in ``files/{apts|rpms}``. The list is intended
# to be passed to a package installer such as apt or yum.
#
-# Only packages required for the services in ``ENABLED_SERVICES`` will be
+# Only packages required for the services in 1st argument will be
# included. Two bits of metadata are recognized in the prerequisite files:
# - ``# NOPRIME`` defers installation to be performed later in stack.sh
# - ``# dist:DISTRO`` or ``dist:DISTRO1,DISTRO2`` limits the selection
# of the package to the distros listed. The distro names are case insensitive.
-#
-# Uses globals ``ENABLED_SERVICES``
-# get_packages dir
function get_packages() {
- local package_dir=$1
+ local services=$1
+ local package_dir=$(_get_package_dir)
local file_to_parse
local service
@@ -141,7 +153,7 @@
if [[ -z "$DISTRO" ]]; then
GetDistro
fi
- for service in general ${ENABLED_SERVICES//,/ }; do
+ for service in general ${services//,/ }; do
# Allow individual services to specify dependencies
if [[ -e ${package_dir}/${service} ]]; then
file_to_parse="${file_to_parse} $service"
diff --git a/lib/cinder b/lib/cinder
index c8291a2..f487c8e 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -50,8 +50,13 @@
CINDER_BIN_DIR=$(get_python_exec_prefix)
fi
-# Name of the lvm volume group to use/create for iscsi volumes
+# Support for multi lvm backend configuration (default is no support)
+CINDER_MULTI_LVM_BACKEND=$(trueorfalse False $CINDER_MULTI_LVM_BACKEND)
+
+# Name of the lvm volume groups to use/create for iscsi volumes
+# VOLUME_GROUP2 is used only if CINDER_MULTI_LVM_BACKEND = True
VOLUME_GROUP=${VOLUME_GROUP:-stack-volumes}
+VOLUME_GROUP2=${VOLUME_GROUP2:-stack-volumes2}
VOLUME_NAME_PREFIX=${VOLUME_NAME_PREFIX:-volume-}
# _clean_volume_group removes all cinder volumes from the specified volume group
@@ -106,6 +111,9 @@
# Campsite rule: leave behind a volume group at least as clean as we found it
_clean_volume_group $VOLUME_GROUP $VOLUME_NAME_PREFIX
+ if [ "$CINDER_MULTI_LVM_BACKEND" = "True" ]; then
+ _clean_volume_group $VOLUME_GROUP2 $VOLUME_NAME_PREFIX
+ fi
}
# configure_cinder() - Set config files, create data dirs, etc
@@ -164,8 +172,18 @@
cp $CINDER_DIR/etc/cinder/cinder.conf.sample $CINDER_CONF
iniset $CINDER_CONF DEFAULT auth_strategy keystone
iniset $CINDER_CONF DEFAULT verbose True
- iniset $CINDER_CONF DEFAULT volume_group $VOLUME_GROUP
- iniset $CINDER_CONF DEFAULT volume_name_template ${VOLUME_NAME_PREFIX}%s
+ if [ "$CINDER_MULTI_LVM_BACKEND" = "True" ]; then
+ iniset $CINDER_CONF DEFAULT enabled_backends lvmdriver-1,lvmdriver-2
+ iniset $CINDER_CONF lvmdriver-1 volume_group $VOLUME_GROUP
+ iniset $CINDER_CONF lvmdriver-1 volume_driver cinder.volume.drivers.lvm.LVMISCSIDriver
+ iniset $CINDER_CONF lvmdriver-1 volume_backend_name LVM_iSCSI
+ iniset $CINDER_CONF lvmdriver-2 volume_group $VOLUME_GROUP2
+ iniset $CINDER_CONF lvmdriver-2 volume_driver cinder.volume.drivers.lvm.LVMISCSIDriver
+ iniset $CINDER_CONF lvmdriver-2 volume_backend_name LVM_iSCSI
+ else
+ iniset $CINDER_CONF DEFAULT volume_group $VOLUME_GROUP
+ iniset $CINDER_CONF DEFAULT volume_name_template ${VOLUME_NAME_PREFIX}%s
+ fi
iniset $CINDER_CONF DEFAULT iscsi_helper tgtadm
local dburl
database_connection_url dburl cinder
@@ -263,12 +281,14 @@
}
create_cinder_volume_group() {
- # Configure a default volume group called '`stack-volumes`' for the volume
- # service if it does not yet exist. If you don't wish to use a file backed
- # volume group, create your own volume group called ``stack-volumes`` before
- # invoking ``stack.sh``.
+ # According to the CINDER_MULTI_LVM_BACKEND value, configure one or two default volumes
+ # group called ``stack-volumes`` (and ``stack-volumes2``) for the volume
+ # service if it (they) does (do) not yet exist. If you don't wish to use a
+ # file backed volume group, create your own volume group called ``stack-volumes``
+ # and ``stack-volumes2`` before invoking ``stack.sh``.
#
- # By default, the backing file is 5G in size, and is stored in ``/opt/stack/data``.
+ # By default, the two backing files are 5G in size, and are stored in
+ # ``/opt/stack/data``.
if ! sudo vgs $VOLUME_GROUP; then
VOLUME_BACKING_FILE=${VOLUME_BACKING_FILE:-$DATA_DIR/${VOLUME_GROUP}-backing-file}
@@ -283,6 +303,23 @@
sudo vgcreate $VOLUME_GROUP $DEV
fi
fi
+ if [ "$CINDER_MULTI_LVM_BACKEND" = "True" ]; then
+ #set up the second volume if CINDER_MULTI_LVM_BACKEND is enabled
+
+ if ! sudo vgs $VOLUME_GROUP2; then
+ VOLUME_BACKING_FILE2=${VOLUME_BACKING_FILE2:-$DATA_DIR/${VOLUME_GROUP2}-backing-file}
+
+ # Only create if the file doesn't already exists
+ [[ -f $VOLUME_BACKING_FILE2 ]] || truncate -s $VOLUME_BACKING_FILE_SIZE $VOLUME_BACKING_FILE2
+
+ DEV=`sudo losetup -f --show $VOLUME_BACKING_FILE2`
+
+ # Only create if the loopback device doesn't contain $VOLUME_GROUP
+ if ! sudo vgs $VOLUME_GROUP2; then
+ sudo vgcreate $VOLUME_GROUP2 $DEV
+ fi
+ fi
+ fi
mkdir -p $CINDER_STATE_PATH/volumes
}
@@ -314,6 +351,9 @@
sudo tgtadm --op show --mode target | grep $VOLUME_NAME_PREFIX | grep Target | cut -f3 -d ' ' | sudo xargs -n1 tgt-admin --delete || true
# Start with a clean volume group
_clean_volume_group $VOLUME_GROUP $VOLUME_NAME_PREFIX
+ if [ "$CINDER_MULTI_LVM_BACKEND" = "True" ]; then
+ _clean_volume_group $VOLUME_GROUP2 $VOLUME_NAME_PREFIX
+ fi
fi
fi
diff --git a/lib/quantum b/lib/quantum
index 0fef1ae..3466162 100644
--- a/lib/quantum
+++ b/lib/quantum
@@ -442,7 +442,6 @@
iniset $Q_DHCP_CONF_FILE DEFAULT verbose True
iniset $Q_DHCP_CONF_FILE DEFAULT debug True
iniset $Q_DHCP_CONF_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE
- iniset $Q_DHCP_CONF_FILE DEFAULT state_path $DATA_DIR/quantum
iniset $Q_DHCP_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND"
_quantum_setup_keystone $Q_DHCP_CONF_FILE DEFAULT set_auth_url
@@ -464,7 +463,6 @@
iniset $Q_L3_CONF_FILE DEFAULT verbose True
iniset $Q_L3_CONF_FILE DEFAULT debug True
iniset $Q_L3_CONF_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE
- iniset $Q_L3_CONF_FILE DEFAULT state_path $DATA_DIR/quantum
iniset $Q_L3_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND"
_quantum_setup_keystone $Q_L3_CONF_FILE DEFAULT set_auth_url
@@ -481,7 +479,6 @@
iniset $Q_META_CONF_FILE DEFAULT verbose True
iniset $Q_META_CONF_FILE DEFAULT debug True
- iniset $Q_META_CONF_FILE DEFAULT state_path $DATA_DIR/quantum
iniset $Q_META_CONF_FILE DEFAULT nova_metadata_ip $Q_META_DATA_IP
iniset $Q_META_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND"
@@ -520,6 +517,7 @@
iniset $QUANTUM_CONF DEFAULT verbose True
iniset $QUANTUM_CONF DEFAULT debug True
+ iniset $QUANTUM_CONF DEFAULT state_path $DATA_DIR/quantum
iniset $QUANTUM_CONF DEFAULT allow_overlapping_ips $Q_ALLOW_OVERLAPPING_IP
iniset $QUANTUM_CONF DEFAULT auth_strategy $Q_AUTH_STRATEGY
diff --git a/lib/quantum_plugins/ovs_base b/lib/quantum_plugins/ovs_base
index 8563674..915129e 100644
--- a/lib/quantum_plugins/ovs_base
+++ b/lib/quantum_plugins/ovs_base
@@ -24,10 +24,13 @@
if is_ubuntu; then
kernel_version=`cat /proc/version | cut -d " " -f3`
install_package make fakeroot dkms openvswitch-switch openvswitch-datapath-dkms linux-headers-$kernel_version
- else
- ### FIXME(dtroyer): Find RPMs for OpenVSwitch
+ elif is_fedora; then
+ install_package openvswitch
+ # Ensure that the service is started
+ restart_service openvswitch
+ elif is_suse; then
+ ### FIXME: Find RPMs for OpenVSwitch
echo "OpenVSwitch packages need to be located"
- # Fedora does not started OVS by default
restart_service openvswitch
fi
}
diff --git a/stack.sh b/stack.sh
index 5874932..7dc0469 100755
--- a/stack.sh
+++ b/stack.sh
@@ -410,7 +410,6 @@
## FIXME(ja): should/can we check that FLAT_INTERFACE is sane?
-
# Database Configuration
# ----------------------
@@ -845,6 +844,18 @@
# Initialize the directory for service status check
init_service_check
+# Kick off Sysstat
+# ------------------------
+# run sysstat if it is enabled, this has to be early as daemon
+# startup is one of the things to track.
+if is_service_enabled sysstat;then
+ if [[ -n ${SCREEN_LOGDIR} ]]; then
+ screen_it sysstat "sar -o $SCREEN_LOGDIR/$SYSSTAT_FILE $SYSSTAT_INTERVAL"
+ else
+ screen_it sysstat "sar $SYSSTAT_INTERVAL"
+ fi
+fi
+
# Keystone
# --------
@@ -1275,14 +1286,6 @@
screen_it baremetal "nova-baremetal-deploy-helper"
fi
-# run sysstat if it is enabled
-if is_service_enabled sysstat;then
- if [[ -n ${SCREEN_LOGDIR} ]]; then
- screen_it sysstat "sar -o $SCREEN_LOGDIR/$SYSSTAT_FILE $SYSSTAT_INTERVAL"
- else
- screen_it sysstat "sar $SYSSTAT_INTERVAL"
- fi
-fi
# Save some values we generated for later use
CURRENT_RUN_TIME=$(date "+$TIMESTAMP_FORMAT")
diff --git a/tools/info.sh b/tools/info.sh
index ef1f338..14ab8f6 100755
--- a/tools/info.sh
+++ b/tools/info.sh
@@ -88,17 +88,7 @@
# - We are going to check packages only for the services needed.
# - We are parsing the packages files and detecting metadatas.
-if is_ubuntu; then
- PKG_DIR=$FILES/apts
-elif is_fedora; then
- PKG_DIR=$FILES/rpms
-elif is_suse; then
- PKG_DIR=$FILES/rpms-suse
-else
- exit_distro_not_supported "list of packages"
-fi
-
-for p in $(get_packages $PKG_DIR); do
+for p in $(get_packages $ENABLED_SERVICES); do
if [[ "$os_PACKAGE" = "deb" ]]; then
ver=$(dpkg -s $p 2>/dev/null | grep '^Version: ' | cut -d' ' -f2)
elif [[ "$os_PACKAGE" = "rpm" ]]; then
diff --git a/tools/install_prereqs.sh b/tools/install_prereqs.sh
index 4d151db..7c4386f 100755
--- a/tools/install_prereqs.sh
+++ b/tools/install_prereqs.sh
@@ -54,15 +54,7 @@
# ================
# Install package requirements
-if is_ubuntu; then
- install_package $(get_packages $FILES/apts)
-elif is_fedora; then
- install_package $(get_packages $FILES/rpms)
-elif is_suse; then
- install_package $(get_packages $FILES/rpms-suse)
-else
- exit_distro_not_supported "list of packages"
-fi
+install_package $(get_packages $ENABLED_SERVICES)
if [[ -n "$SYSLOG" && "$SYSLOG" != "False" ]]; then
if is_ubuntu || is_fedora; then