Merge "Move hypervisor-specific code into a case statement"
diff --git a/files/rpms/horizon b/files/rpms/horizon
index 151e7e2..d50482e 100644
--- a/files/rpms/horizon
+++ b/files/rpms/horizon
@@ -16,7 +16,8 @@
python-migrate
python-mox
python-netaddr
-python-nose
+# RHEL6's python-nose is incompatible with Tempest
+python-nose #dist:f16,f17,f18
python-paste #dist:f16,f17,f18
python-paste-deploy #dist:f16,f17,f18
python-pep8
diff --git a/files/rpms/swift b/files/rpms/swift
index 1b36e34..c626d8e 100644
--- a/files/rpms/swift
+++ b/files/rpms/swift
@@ -7,7 +7,8 @@
python-eventlet
python-greenlet
python-netifaces
-python-nose
+# RHEL6's python-nose is incompatible with Tempest
+python-nose # dist:f16,f17,f18
python-paste-deploy # dist:f16,f17,f18
python-setuptools # dist:f16,f17,f18
python-simplejson
diff --git a/lib/cinder b/lib/cinder
index 82e7454..7e9c2ba 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -58,6 +58,14 @@
# https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1023755
CINDER_SECURE_DELETE=`trueorfalse True $CINDER_SECURE_DELETE`
+# Cinder reports allocations back to the scheduler on periodic intervals
+# it turns out we can get an "out of space" issue when we run tests too
+# quickly just because cinder didn't realize we'd freed up resources.
+# Make this configurable so that devstack-gate/tempest can set it to
+# less than the 60 second default
+# https://bugs.launchpad.net/cinder/+bug/1180976
+CINDER_PERIODIC_INTERVAL=${CINDER_PERIODIC_INTERVAL:-60}
+
# 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}
@@ -197,6 +205,7 @@
iniset $CINDER_CONF DEFAULT rootwrap_config "$CINDER_CONF_DIR/rootwrap.conf"
iniset $CINDER_CONF DEFAULT osapi_volume_extension cinder.api.contrib.standard_extensions
iniset $CINDER_CONF DEFAULT state_path $CINDER_STATE_PATH
+ iniset $CINDER_CONF DEFAULT periodic_interval $CINDER_PERIODIC_INTERVAL
if is_service_enabled tls-proxy; then
# Set the service port for a proxy to take the original
diff --git a/lib/nova b/lib/nova
index 6fc0c79..9fc4ded 100644
--- a/lib/nova
+++ b/lib/nova
@@ -151,7 +151,7 @@
instances=`sudo virsh list --all | grep $INSTANCE_NAME_PREFIX | sed "s/.*\($INSTANCE_NAME_PREFIX[0-9a-fA-F]*\).*/\1/g"`
if [ ! "$instances" = "" ]; then
echo $instances | xargs -n1 sudo virsh destroy || true
- echo $instances | xargs -n1 sudo virsh undefine || true
+ echo $instances | xargs -n1 sudo virsh undefine --managed-save || true
fi
# Logout and delete iscsi sessions
diff --git a/lib/quantum b/lib/quantum
index dfd73e9..c36a743 100644
--- a/lib/quantum
+++ b/lib/quantum
@@ -75,7 +75,7 @@
# Default Quantum Port
Q_PORT=${Q_PORT:-9696}
# Default Quantum Host
-Q_HOST=${Q_HOST:-$HOST_IP}
+Q_HOST=${Q_HOST:-$SERVICE_HOST}
# Default admin username
Q_ADMIN_USERNAME=${Q_ADMIN_USERNAME:-quantum}
# Default auth strategy
@@ -86,7 +86,7 @@
Q_OVS_USE_VETH=${Q_OVS_USE_VETH:-False}
Q_USE_ROOTWRAP=${Q_USE_ROOTWRAP:-True}
# Meta data IP
-Q_META_DATA_IP=${Q_META_DATA_IP:-$HOST_IP}
+Q_META_DATA_IP=${Q_META_DATA_IP:-$SERVICE_HOST}
# Allow Overlapping IP among subnets
Q_ALLOW_OVERLAPPING_IP=${Q_ALLOW_OVERLAPPING_IP:-True}
# Use quantum-debug command
@@ -406,7 +406,14 @@
# cleanup_quantum() - Remove residual data files, anything left over from previous
# runs that a clean run would need to clean up
function cleanup_quantum() {
- :
+ if is_quantum_ovs_base_plugin; then
+ quantum_ovs_base_cleanup
+ fi
+
+ # delete all namespaces created by quantum
+ for ns in $(sudo ip netns list | grep -o -e qdhcp-[0-9a-f\-]* -e qrouter-[0-9a-f\-]*); do
+ sudo ip netns delete ${ns}
+ done
}
# _configure_quantum_common()
@@ -502,7 +509,6 @@
# for l3-agent, only use per tenant router if we have namespaces
Q_L3_ROUTER_PER_TENANT=$Q_USE_NAMESPACE
AGENT_L3_BINARY="$QUANTUM_DIR/bin/quantum-l3-agent"
- PUBLIC_BRIDGE=${PUBLIC_BRIDGE:-br-ex}
Q_L3_CONF_FILE=$QUANTUM_CONF_DIR/l3_agent.ini
cp $QUANTUM_DIR/etc/l3_agent.ini $Q_L3_CONF_FILE
@@ -581,10 +587,6 @@
iniset $QUANTUM_CONF DEFAULT auth_strategy $Q_AUTH_STRATEGY
_quantum_setup_keystone $QUANTUM_CONF keystone_authtoken
- # Comment out keystone authtoken configuration in api-paste.ini
- # It is required to avoid any breakage in Quantum where the sample
- # api-paste.ini has authtoken configurations.
- _quantum_commentout_keystone_authtoken $Q_API_PASTE_FILE filter:authtoken
# Configure plugin
quantum_plugin_configure_service
@@ -655,21 +657,6 @@
rm -f $QUANTUM_AUTH_CACHE_DIR/*
}
-function _quantum_commentout_keystone_authtoken() {
- local conf_file=$1
- local section=$2
-
- inicomment $conf_file $section auth_host
- inicomment $conf_file $section auth_port
- inicomment $conf_file $section auth_protocol
- inicomment $conf_file $section auth_url
-
- inicomment $conf_file $section admin_tenant_name
- inicomment $conf_file $section admin_user
- inicomment $conf_file $section admin_password
- inicomment $conf_file $section signing_dir
-}
-
function _quantum_setup_interface_driver() {
# ovs_use_veth needs to be set before the plugin configuration
diff --git a/lib/quantum_plugins/nec b/lib/quantum_plugins/nec
index 4a2a497..411f5a4 100644
--- a/lib/quantum_plugins/nec
+++ b/lib/quantum_plugins/nec
@@ -17,8 +17,6 @@
OFC_RETRY_MAX=${OFC_RETRY_MAX:-0}
OFC_RETRY_INTERVAL=${OFC_RETRY_INTERVAL:-1}
-OVS_BRIDGE=${OVS_BRIDGE:-br-int}
-
# Main logic
# ---------------------------
diff --git a/lib/quantum_plugins/nicira b/lib/quantum_plugins/nicira
index 305c3bf..fc06b55 100644
--- a/lib/quantum_plugins/nicira
+++ b/lib/quantum_plugins/nicira
@@ -8,7 +8,6 @@
source $TOP_DIR/lib/quantum_plugins/ovs_base
function setup_integration_bridge() {
- OVS_BRIDGE=${OVS_BRIDGE:-br-int}
_quantum_ovs_base_setup_bridge $OVS_BRIDGE
# Set manager to NVP controller (1st of list)
if [[ "$NVP_CONTROLLERS" != "" ]]; then
diff --git a/lib/quantum_plugins/openvswitch b/lib/quantum_plugins/openvswitch
index dda9e61..3741720 100644
--- a/lib/quantum_plugins/openvswitch
+++ b/lib/quantum_plugins/openvswitch
@@ -41,7 +41,6 @@
function quantum_plugin_configure_plugin_agent() {
# Setup integration bridge
- OVS_BRIDGE=${OVS_BRIDGE:-br-int}
_quantum_ovs_base_setup_bridge $OVS_BRIDGE
_quantum_ovs_base_configure_firewall_driver
diff --git a/lib/quantum_plugins/ovs_base b/lib/quantum_plugins/ovs_base
index 2ada0db..a5e03ac 100644
--- a/lib/quantum_plugins/ovs_base
+++ b/lib/quantum_plugins/ovs_base
@@ -5,6 +5,9 @@
MY_XTRACE=$(set +o | grep xtrace)
set +o xtrace
+OVS_BRIDGE=${OVS_BRIDGE:-br-int}
+PUBLIC_BRIDGE=${PUBLIC_BRIDGE:-br-ex}
+
function is_quantum_ovs_base_plugin() {
# Yes, we use OVS.
return 0
@@ -17,6 +20,18 @@
sudo ovs-vsctl --no-wait br-set-external-id $bridge bridge-id $bridge
}
+function quantum_ovs_base_cleanup() {
+ # remove all OVS ports that look like Quantum created ports
+ for port in $(sudo ovs-vsctl list port | grep -o -e tap[0-9a-f\-]* -e q[rg]-[0-9a-f\-]*); do
+ sudo ovs-vsctl del-port ${port}
+ done
+
+ # remove all OVS bridges created by Quantum
+ for bridge in $(sudo ovs-vsctl list-br | grep -o -e ${OVS_BRIDGE} -e ${PUBLIC_BRIDGE}); do
+ sudo ovs-vsctl del-br ${bridge}
+ done
+}
+
function _quantum_ovs_base_install_agent_packages() {
local kernel_version
# Install deps
diff --git a/lib/quantum_plugins/ryu b/lib/quantum_plugins/ryu
index 1b039dc..c482747 100644
--- a/lib/quantum_plugins/ryu
+++ b/lib/quantum_plugins/ryu
@@ -45,7 +45,6 @@
function quantum_plugin_configure_plugin_agent() {
# Set up integration bridge
- OVS_BRIDGE=${OVS_BRIDGE:-br-int}
_quantum_ovs_base_setup_bridge $OVS_BRIDGE
if [ -n "$RYU_INTERNAL_INTERFACE" ]; then
sudo ovs-vsctl --no-wait -- --may-exist add-port $OVS_BRIDGE $RYU_INTERNAL_INTERFACE
diff --git a/lib/quantum_thirdparty/bigswitch_floodlight b/lib/quantum_thirdparty/bigswitch_floodlight
index 60e3924..385bd0d 100644
--- a/lib/quantum_thirdparty/bigswitch_floodlight
+++ b/lib/quantum_thirdparty/bigswitch_floodlight
@@ -7,7 +7,6 @@
BS_FL_CONTROLLERS_PORT=${BS_FL_CONTROLLERS_PORT:-localhost:80}
BS_FL_OF_PORT=${BS_FL_OF_PORT:-6633}
-OVS_BRIDGE=${OVS_BRIDGE:-br-int}
function configure_bigswitch_floodlight() {
:
diff --git a/stack.sh b/stack.sh
index 7ec25cf..5dea000 100755
--- a/stack.sh
+++ b/stack.sh
@@ -565,7 +565,9 @@
if [[ is_fedora && $DISTRO =~ (rhel6) ]]; then
# Avoid having to configure selinux to allow things like httpd to
# access horizion files or run binaries like nodejs (LP#1175444)
- sudo setenforce 0
+ if selinuxenabled; then
+ sudo setenforce 0
+ fi
# An old version (2.0.1) of python-crypto is probably installed on
# a fresh system, via the dependency chain
diff --git a/tools/xen/functions b/tools/xen/functions
index a7d7798..26ddb8b 100644
--- a/tools/xen/functions
+++ b/tools/xen/functions
@@ -65,3 +65,31 @@
function get_local_sr_path {
echo "/var/run/sr-mount/$(get_local_sr)"
}
+
+function find_ip_by_name() {
+ local guest_name="$1"
+ local interface="$2"
+
+ local period=10
+ local max_tries=10
+ local i=0
+
+ while true; do
+ if [ $i -ge $max_tries ]; then
+ echo "Timeout: ip address for interface $interface of $guest_name"
+ exit 11
+ fi
+
+ ipaddress=$(xe vm-list --minimal \
+ name-label=$guest_name \
+ params=networks | sed -ne "s,^.*${interface}/ip: \([0-9.]*\).*\$,\1,p")
+
+ if [ -z "$ipaddress" ]; then
+ sleep $period
+ ((i++))
+ else
+ echo $ipaddress
+ break
+ fi
+ done
+}
diff --git a/tools/xen/install_os_domU.sh b/tools/xen/install_os_domU.sh
index 0e194fe..0d5e31e 100755
--- a/tools/xen/install_os_domU.sh
+++ b/tools/xen/install_os_domU.sh
@@ -311,53 +311,26 @@
#
xe vm-start vm="$GUEST_NAME"
-
-#
-# Find IP and optionally wait for stack.sh to complete
-#
-
-function find_ip_by_name() {
- local guest_name="$1"
- local interface="$2"
- local period=10
- max_tries=10
- i=0
- while true
- do
- if [ $i -ge $max_tries ]; then
- echo "Timed out waiting for devstack ip address"
- exit 11
- fi
-
- devstackip=$(xe vm-list --minimal \
- name-label=$guest_name \
- params=networks | sed -ne "s,^.*${interface}/ip: \([0-9.]*\).*\$,\1,p")
- if [ -z "$devstackip" ]
- then
- sleep $period
- ((i++))
- else
- echo $devstackip
- break
- fi
- done
-}
-
function ssh_no_check() {
ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$@"
}
-# Note the XenServer needs to be on the chosen
-# network, so XenServer can access Glance API
+# Get hold of the Management IP of OpenStack VM
+OS_VM_MANAGEMENT_ADDRESS=$MGT_IP
+if [ $OS_VM_MANAGEMENT_ADDRESS == "dhcp" ]; then
+ OS_VM_MANAGEMENT_ADDRESS=$(find_ip_by_name $GUEST_NAME 2)
+fi
+
+# Get hold of the Service IP of OpenStack VM
if [ $HOST_IP_IFACE == "eth2" ]; then
- DOMU_IP=$MGT_IP
+ OS_VM_SERVICES_ADDRESS=$MGT_IP
if [ $MGT_IP == "dhcp" ]; then
- DOMU_IP=$(find_ip_by_name $GUEST_NAME 2)
+ OS_VM_SERVICES_ADDRESS=$(find_ip_by_name $GUEST_NAME 2)
fi
else
- DOMU_IP=$PUB_IP
+ OS_VM_SERVICES_ADDRESS=$PUB_IP
if [ $PUB_IP == "dhcp" ]; then
- DOMU_IP=$(find_ip_by_name $GUEST_NAME 3)
+ OS_VM_SERVICES_ADDRESS=$(find_ip_by_name $GUEST_NAME 3)
fi
fi
@@ -369,11 +342,11 @@
echo "VM Launched - Waiting for startup script"
# wait for log to appear
- while ! ssh_no_check -q stack@$DOMU_IP "[ -e run.sh.log ]"; do
+ while ! ssh_no_check -q stack@$OS_VM_MANAGEMENT_ADDRESS "[ -e run.sh.log ]"; do
sleep 10
done
echo -n "Running"
- while [ `ssh_no_check -q stack@$DOMU_IP pgrep -c run.sh` -ge 1 ]
+ while [ `ssh_no_check -q stack@$OS_VM_MANAGEMENT_ADDRESS pgrep -c run.sh` -ge 1 ]
do
sleep 10
echo -n "."
@@ -382,17 +355,17 @@
set -x
# output the run.sh.log
- ssh_no_check -q stack@$DOMU_IP 'cat run.sh.log'
+ ssh_no_check -q stack@$OS_VM_MANAGEMENT_ADDRESS 'cat run.sh.log'
# Fail if the expected text is not found
- ssh_no_check -q stack@$DOMU_IP 'cat run.sh.log' | grep -q 'stack.sh completed in'
+ ssh_no_check -q stack@$OS_VM_MANAGEMENT_ADDRESS 'cat run.sh.log' | grep -q 'stack.sh completed in'
set +x
echo "################################################################################"
echo ""
echo "All Finished!"
echo "You can visit the OpenStack Dashboard"
- echo "at http://$DOMU_IP, and contact other services at the usual ports."
+ echo "at http://$OS_VM_SERVICES_ADDRESS, and contact other services at the usual ports."
else
set +x
echo "################################################################################"
@@ -401,9 +374,9 @@
echo "Now, you can monitor the progress of the stack.sh installation by "
echo "tailing /opt/stack/run.sh.log from within your domU."
echo ""
- echo "ssh into your domU now: 'ssh stack@$DOMU_IP' using your password"
+ echo "ssh into your domU now: 'ssh stack@$OS_VM_MANAGEMENT_ADDRESS' using your password"
echo "and then do: 'tail -f /opt/stack/run.sh.log'"
echo ""
echo "When the script completes, you can then visit the OpenStack Dashboard"
- echo "at http://$DOMU_IP, and contact other services at the usual ports."
+ echo "at http://$OS_VM_SERVICES_ADDRESS, and contact other services at the usual ports."
fi
diff --git a/unstack.sh b/unstack.sh
index 3ac2985..d1d0349 100755
--- a/unstack.sh
+++ b/unstack.sh
@@ -109,4 +109,5 @@
if is_service_enabled quantum; then
stop_quantum
stop_quantum_third_party
+ cleanup_quantum
fi