Merge "2.5x increase in default volume backing file size"
diff --git a/.gitignore b/.gitignore
index 83c5419..c5744b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,10 @@
*~
.*.sw[nop]
*.log
+*.log.[1-9]
src
localrc
local.sh
+files/*.gz
+files/images
+stack-screenrc
diff --git a/AUTHORS b/AUTHORS
index 67120f6..6141d67 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,5 @@
Aaron Lee <aaron.lee@rackspace.com>
+Aaron Rosen <arosen@nicira.com>
Adam Gandelman <adamg@canonical.com>
Andy Smith <github@anarkystic.com>
Anthony Young <sleepsonthefloor@gmail.com>
@@ -11,7 +12,9 @@
Doug hellmann <doug.hellmann@dreamhost.com>
Eddie Hebert <edhebert@gmail.com>
Eoghan Glynn <eglynn@redhat.com>
+Eric Windisch <ewindisch@cloudscaling.com>
Gabriel Hurley <gabriel@strikeawe.com>
+Gary Kotton <gkotton@redhat.com>
Hengqing Hu <hudayou@hotmail.com>
Hua ZHANG <zhuadl@cn.ibm.com>
Jake Dahn <admin@jakedahn.com>
diff --git a/files/apts/general b/files/apts/general
index 31fa752..f04f955 100644
--- a/files/apts/general
+++ b/files/apts/general
@@ -17,3 +17,4 @@
curl
tcpdump
euca2ools # only for testing client
+tar
diff --git a/files/rpms/general b/files/rpms/general
index af199d5..52184d0 100644
--- a/files/rpms/general
+++ b/files/rpms/general
@@ -9,6 +9,7 @@
python-unittest2
python-virtualenv
screen
+tar
tcpdump
unzip
wget
diff --git a/functions b/functions
index a22d8b7..46a6f8a 100644
--- a/functions
+++ b/functions
@@ -224,6 +224,24 @@
}
+# Translate the OS version values into common nomenclature
+# Sets ``DISTRO`` from the ``os_*`` values
+function GetDistro() {
+ GetOSVersion
+ if [[ "$os_VENDOR" =~ (Ubuntu) ]]; then
+ # 'Everyone' refers to Ubuntu releases by the code name adjective
+ DISTRO=$os_CODENAME
+ elif [[ "$os_VENDOR" =~ (Fedora) ]]; then
+ # For Fedora, just use 'f' and the release
+ DISTRO="f$os_RELEASE"
+ else
+ # Catch-all for now is Vendor + Release + Update
+ DISTRO="$os_VENDOR-$os_RELEASE.$os_UPDATE"
+ fi
+ export DISTRO
+}
+
+
# git clone only if directory doesn't exist already. Since ``DEST`` might not
# be owned by the installation user, we create the directory and change the
# ownership to the proper user.
@@ -458,7 +476,7 @@
else
CMD_PIP=/usr/bin/pip-python
fi
- sudo PIP_DOWNLOAD_CACHE=/var/cache/pip \
+ sudo PIP_DOWNLOAD_CACHE=${PIP_DOWNLOAD_CACHE:-/var/cache/pip} \
HTTP_PROXY=$http_proxy \
HTTPS_PROXY=$https_proxy \
$CMD_PIP install --use-mirrors $@
diff --git a/lib/cinder b/lib/cinder
index cd64aaf..119cc91 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -105,6 +105,11 @@
fi
if sudo vgs $VOLUME_GROUP; then
+ if [[ "$os_PACKAGE" = "rpm" ]]; then
+ # RPM doesn't start the service
+ start_service tgtd
+ fi
+
# Remove iscsi targets
sudo tgtadm --op show --mode target | grep $VOLUME_NAME_PREFIX | grep Target | cut -f3 -d ' ' | sudo xargs -n1 tgt-admin --delete || true
# Clean out existing volumes
diff --git a/stack.sh b/stack.sh
index dafe664..93d20d4 100755
--- a/stack.sh
+++ b/stack.sh
@@ -26,19 +26,8 @@
# Determine what system we are running on. This provides ``os_VENDOR``,
# ``os_RELEASE``, ``os_UPDATE``, ``os_PACKAGE``, ``os_CODENAME``
-GetOSVersion
-
-# Translate the OS version values into common nomenclature
-if [[ "$os_VENDOR" =~ (Ubuntu) ]]; then
- # 'Everyone' refers to Ubuntu releases by the code name adjective
- DISTRO=$os_CODENAME
-elif [[ "$os_VENDOR" =~ (Fedora) ]]; then
- # For Fedora, just use 'f' and the release
- DISTRO="f$os_RELEASE"
-else
- # Catch-all for now is Vendor + Release + Update
- DISTRO="$os_VENDOR-$os_RELEASE.$os_UPDATE"
-fi
+# and ``DISTRO``
+GetDistro
# Settings
@@ -264,6 +253,13 @@
Q_PORT=${Q_PORT:-9696}
# Default Quantum Host
Q_HOST=${Q_HOST:-localhost}
+# Which Quantum API nova should use
+NOVA_USE_QUANTUM_API=${NOVA_USE_QUANTUM_API:-v1}
+# Default admin username
+Q_ADMIN_USERNAME=${Q_ADMIN_USERNAME:-quantum}
+# Default auth strategy
+Q_AUTH_STRATEGY=${Q_AUTH_STRATEGY:-keystone}
+
# Default Melange Port
M_PORT=${M_PORT:-9898}
@@ -375,6 +371,7 @@
PUBLIC_INTERFACE=${PUBLIC_INTERFACE:-br100}
FIXED_RANGE=${FIXED_RANGE:-10.0.0.0/24}
FIXED_NETWORK_SIZE=${FIXED_NETWORK_SIZE:-256}
+NETWORK_GATEWAY=${NETWORK_GATEWAY:-10.0.0.1}
FLOATING_RANGE=${FLOATING_RANGE:-172.24.4.224/28}
NET_MAN=${NET_MAN:-FlatDHCPManager}
EC2_DMZ_HOST=${EC2_DMZ_HOST:-$SERVICE_HOST}
@@ -689,6 +686,8 @@
if is_service_enabled swift; then
setup_develop $SWIFT_DIR
setup_develop $SWIFTCLIENT_DIR
+fi
+if is_service_enabled swift3; then
setup_develop $SWIFT3_DIR
fi
if is_service_enabled g-api n-api; then
@@ -1023,7 +1022,11 @@
Q_PLUGIN_CONF_PATH=etc/quantum/plugins/openvswitch
Q_PLUGIN_CONF_FILENAME=ovs_quantum_plugin.ini
Q_DB_NAME="ovs_quantum"
- Q_PLUGIN_CLASS="quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPlugin"
+ if [[ "$NOVA_USE_QUANTUM_API" = "v1" ]]; then
+ Q_PLUGIN_CLASS="quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPlugin"
+ elif [[ "$NOVA_USE_QUANTUM_API" = "v2" ]]; then
+ Q_PLUGIN_CLASS="quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2"
+ fi
elif [[ "$Q_PLUGIN" = "linuxbridge" ]]; then
# Install deps
# FIXME add to files/apts/quantum, but don't install if not needed!
@@ -1031,7 +1034,11 @@
Q_PLUGIN_CONF_PATH=etc/quantum/plugins/linuxbridge
Q_PLUGIN_CONF_FILENAME=linuxbridge_conf.ini
Q_DB_NAME="quantum_linux_bridge"
- Q_PLUGIN_CLASS="quantum.plugins.linuxbridge.LinuxBridgePlugin.LinuxBridgePlugin"
+ if [[ "$NOVA_USE_QUANTUM_API" = "v1" ]]; then
+ Q_PLUGIN_CLASS="quantum.plugins.linuxbridge.LinuxBridgePlugin.LinuxBridgePlugin"
+ elif [[ "$NOVA_USE_QUANTUM_API" = "v2" ]]; then
+ Q_PLUGIN_CLASS="quantum.plugins.linuxbridge.lb_quantum_plugin.LinuxBridgePluginV2"
+ fi
else
echo "Unknown Quantum plugin '$Q_PLUGIN'.. exiting"
exit 1
@@ -1055,6 +1062,12 @@
fi
sudo sed -i -e "s/.*enable_tunneling = .*$/enable_tunneling = $OVS_ENABLE_TUNNELING/g" /$Q_PLUGIN_CONF_FILE
fi
+
+ if [[ "$NOVA_USE_QUANTUM_API" = "v1" ]]; then
+ iniset /$Q_PLUGIN_CONF_FILE AGENT target_v2_api False
+ elif [[ "$NOVA_USE_QUANTUM_API" = "v2" ]]; then
+ iniset /$Q_PLUGIN_CONF_FILE AGENT target_v2_api True
+ fi
fi
# Quantum service (for controller node)
@@ -1064,15 +1077,15 @@
Q_POLICY_FILE=/etc/quantum/policy.json
if [[ -e $QUANTUM_DIR/etc/quantum.conf ]]; then
- sudo mv $QUANTUM_DIR/etc/quantum.conf $Q_CONF_FILE
+ sudo cp $QUANTUM_DIR/etc/quantum.conf $Q_CONF_FILE
fi
if [[ -e $QUANTUM_DIR/etc/api-paste.ini ]]; then
- sudo mv $QUANTUM_DIR/etc/api-paste.ini $Q_API_PASTE_FILE
+ sudo cp $QUANTUM_DIR/etc/api-paste.ini $Q_API_PASTE_FILE
fi
if [[ -e $QUANTUM_DIR/etc/policy.json ]]; then
- sudo mv $QUANTUM_DIR/etc/policy.json $Q_POLICY_FILE
+ sudo cp $QUANTUM_DIR/etc/policy.json $Q_POLICY_FILE
fi
if is_service_enabled mysql; then
@@ -1110,19 +1123,50 @@
sudo ovs-vsctl --no-wait add-br $OVS_BRIDGE
sudo ovs-vsctl --no-wait br-set-external-id $OVS_BRIDGE bridge-id br-int
sudo sed -i -e "s/.*local_ip = .*/local_ip = $HOST_IP/g" /$Q_PLUGIN_CONF_FILE
- AGENT_BINARY=$QUANTUM_DIR/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py
+ AGENT_BINARY="$QUANTUM_DIR/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py"
elif [[ "$Q_PLUGIN" = "linuxbridge" ]]; then
# Start up the quantum <-> linuxbridge agent
install_package bridge-utils
#set the default network interface
QUANTUM_LB_PRIVATE_INTERFACE=${QUANTUM_LB_PRIVATE_INTERFACE:-$GUEST_INTERFACE_DEFAULT}
sudo sed -i -e "s/^physical_interface = .*$/physical_interface = $QUANTUM_LB_PRIVATE_INTERFACE/g" /$Q_PLUGIN_CONF_FILE
- AGENT_BINARY=$QUANTUM_DIR/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py
+ AGENT_BINARY="$QUANTUM_DIR/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py"
fi
# Start up the quantum agent
screen_it q-agt "sudo python $AGENT_BINARY /$Q_PLUGIN_CONF_FILE -v"
fi
+# Quantum DHCP
+if is_service_enabled q-dhcp; then
+ AGENT_DHCP_BINARY="$QUANTUM_DIR/bin/quantum-dhcp-agent"
+
+ Q_DHCP_CONF_FILE=/etc/quantum/dhcp_agent.ini
+
+ if [[ -e $QUANTUM_DIR/etc/dhcp_agent.ini ]]; then
+ sudo cp $QUANTUM_DIR/etc/dhcp_agent.ini $Q_DHCP_CONF_FILE
+ fi
+
+ # Set verbose
+ iniset $Q_DHCP_CONF_FILE DEFAULT verbose True
+ # Set debug
+ iniset $Q_DHCP_CONF_FILE DEFAULT debug True
+
+ # Update database
+ iniset $Q_DHCP_CONF_FILE DEFAULT db_connection "mysql:\/\/$MYSQL_USER:$MYSQL_PASSWORD@$MYSQL_HOST\/$Q_DB_NAME?charset=utf8"
+ iniset $Q_DHCP_CONF_FILE DEFAULT auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_AUTH_HOST:$KEYSTONE_AUTH_PORT/v2.0"
+ iniset $Q_DHCP_CONF_FILE DEFAULT admin_tenant_name $SERVICE_TENANT_NAME
+ iniset $Q_DHCP_CONF_FILE DEFAULT admin_user $Q_ADMIN_USERNAME
+ iniset $Q_DHCP_CONF_FILE DEFAULT admin_password $SERVICE_PASSWORD
+
+ if [[ "$Q_PLUGIN" = "openvswitch" ]]; then
+ iniset $Q_DHCP_CONF_FILE DEFAULT interface_driver quantum.agent.linux.interface.OVSInterfaceDriver
+ elif [[ "$Q_PLUGIN" = "linuxbridge" ]]; then
+ iniset $Q_DHCP_CONF_FILE DEFAULT interface_driver quantum.agent.linux.interface.BridgeInterfaceDriver
+ fi
+ # Start up the quantum agent
+ screen_it q-dhcp "sudo python $AGENT_DHCP_BINARY --config-file=$Q_DHCP_CONF_FILE"
+fi
+
# Melange service
if is_service_enabled m-svc; then
if is_service_enabled mysql; then
@@ -1374,7 +1418,7 @@
install_package memcached
# We make sure to kill all swift processes first
- pkill -f -9 swift-
+ swift-init all stop || true
# We first do a bit of setup by creating the directories and
# changing the permissions so we can run it as our user.
@@ -1501,6 +1545,7 @@
admin_tenant_name = ${SERVICE_TENANT_NAME}
admin_user = swift
admin_password = ${SERVICE_PASSWORD}
+delay_auth_decision = 1
EOF
if is_service_enabled swift3;then
cat <<EOF>>${SWIFT_CONFIG_PROXY_SERVER}
@@ -1650,6 +1695,11 @@
fi
if sudo vgs $VOLUME_GROUP; then
+ if [[ "$os_PACKAGE" = "rpm" ]]; then
+ # RPM doesn't start the service
+ start_service tgtd
+ fi
+
# Remove nova iscsi targets
sudo tgtadm --op show --mode target | grep $VOLUME_NAME_PREFIX | grep Target | cut -f3 -d ' ' | sudo xargs -n1 tgt-admin --delete || true
# Clean out existing volumes
@@ -1667,8 +1717,7 @@
sudo stop tgt || true
sudo start tgt
else
- # bypass redirection to systemctl during restart
- sudo /sbin/service --skip-redirect tgtd restart
+ restart_service tgtd
fi
fi
@@ -1693,15 +1742,27 @@
add_nova_opt "s3_host=$SERVICE_HOST"
add_nova_opt "s3_port=$S3_SERVICE_PORT"
if is_service_enabled quantum; then
- add_nova_opt "network_manager=nova.network.quantum.manager.QuantumManager"
- add_nova_opt "quantum_connection_host=$Q_HOST"
- add_nova_opt "quantum_connection_port=$Q_PORT"
+ if [[ "$NOVA_USE_QUANTUM_API" = "v1" ]]; then
+ add_nova_opt "network_manager=nova.network.quantum.manager.QuantumManager"
+ add_nova_opt "quantum_connection_host=$Q_HOST"
+ add_nova_opt "quantum_connection_port=$Q_PORT"
+ add_nova_opt "quantum_use_dhcp=True"
- if is_service_enabled melange; then
- add_nova_opt "quantum_ipam_lib=nova.network.quantum.melange_ipam_lib"
- add_nova_opt "use_melange_mac_generation=True"
- add_nova_opt "melange_host=$M_HOST"
- add_nova_opt "melange_port=$M_PORT"
+ if is_service_enabled melange; then
+ add_nova_opt "quantum_ipam_lib=nova.network.quantum.melange_ipam_lib"
+ add_nova_opt "use_melange_mac_generation=True"
+ add_nova_opt "melange_host=$M_HOST"
+ add_nova_opt "melange_port=$M_PORT"
+ fi
+
+ elif [[ "$NOVA_USE_QUANTUM_API" = "v2" ]]; then
+ add_nova_opt "network_api_class=nova.network.quantumv2.api.API"
+ add_nova_opt "quantum_admin_username=$Q_ADMIN_USERNAME"
+ add_nova_opt "quantum_admin_password=$SERVICE_PASSWORD"
+ add_nova_opt "quantum_admin_auth_url=$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v2.0"
+ add_nova_opt "quantum_auth_strategy=$Q_AUTH_STRATEGY"
+ add_nova_opt "quantum_admin_tenant_name=$SERVICE_TENANT_NAME"
+ add_nova_opt "quantum_url=http://$Q_HOST:$Q_PORT"
fi
if [[ "$Q_PLUGIN" = "openvswitch" ]]; then
@@ -1714,7 +1775,6 @@
add_nova_opt "libvirt_vif_type=ethernet"
add_nova_opt "libvirt_vif_driver=$NOVA_VIF_DRIVER"
add_nova_opt "linuxnet_interface_driver=$LINUXNET_VIF_DRIVER"
- add_nova_opt "quantum_use_dhcp=True"
else
add_nova_opt "network_manager=nova.network.manager.$NET_MAN"
fi
@@ -1913,9 +1973,9 @@
# Add quantum endpoints to service catalog if quantum is enabled
if is_service_enabled quantum; then
- echo "catalog.RegionOne.network.publicURL = http://%SERVICE_HOST%:9696/" >> $KEYSTONE_CATALOG
- echo "catalog.RegionOne.network.adminURL = http://%SERVICE_HOST%:9696/" >> $KEYSTONE_CATALOG
- echo "catalog.RegionOne.network.internalURL = http://%SERVICE_HOST%:9696/" >> $KEYSTONE_CATALOG
+ echo "catalog.RegionOne.network.publicURL = http://%SERVICE_HOST%:$Q_PORT/" >> $KEYSTONE_CATALOG
+ echo "catalog.RegionOne.network.adminURL = http://%SERVICE_HOST%:$Q_PORT/" >> $KEYSTONE_CATALOG
+ echo "catalog.RegionOne.network.internalURL = http://%SERVICE_HOST%:$Q_PORT/" >> $KEYSTONE_CATALOG
echo "catalog.RegionOne.network.name = Quantum Service" >> $KEYSTONE_CATALOG
fi
@@ -1959,7 +2019,7 @@
SERVICE_TOKEN=$SERVICE_TOKEN SERVICE_ENDPOINT=$SERVICE_ENDPOINT SERVICE_HOST=$SERVICE_HOST \
S3_SERVICE_PORT=$S3_SERVICE_PORT KEYSTONE_CATALOG_BACKEND=$KEYSTONE_CATALOG_BACKEND \
DEVSTACK_DIR=$TOP_DIR ENABLED_SERVICES=$ENABLED_SERVICES \
- bash $FILES/keystone_data.sh
+ bash -x $FILES/keystone_data.sh
# Set up auth creds now that keystone is bootstrapped
export OS_AUTH_URL=$SERVICE_ENDPOINT
@@ -1994,14 +2054,24 @@
# If we're using Quantum (i.e. q-svc is enabled), network creation has to
# happen after we've started the Quantum service.
if is_service_enabled mysql && is_service_enabled nova; then
- # Create a small network
- $NOVA_DIR/bin/nova-manage network create private $FIXED_RANGE 1 $FIXED_NETWORK_SIZE $NETWORK_CREATE_ARGS
+ if [[ "$NOVA_USE_QUANTUM_API" = "v1" ]]; then
+ # Create a small network
+ $NOVA_DIR/bin/nova-manage network create private $FIXED_RANGE 1 $FIXED_NETWORK_SIZE $NETWORK_CREATE_ARGS
- # Create some floating ips
- $NOVA_DIR/bin/nova-manage floating create $FLOATING_RANGE
+ # Create some floating ips
+ $NOVA_DIR/bin/nova-manage floating create $FLOATING_RANGE
- # Create a second pool
- $NOVA_DIR/bin/nova-manage floating create --ip_range=$TEST_FLOATING_RANGE --pool=$TEST_FLOATING_POOL
+ # Create a second pool
+ $NOVA_DIR/bin/nova-manage floating create --ip_range=$TEST_FLOATING_RANGE --pool=$TEST_FLOATING_POOL
+ elif [[ "$NOVA_USE_QUANTUM_API" = "v2" ]]; then
+ TENANT_ID=$(keystone tenant-list | grep " demo " | get_field 1)
+
+ # Create a small network
+ NET_ID=$(quantum net-create --os_token $Q_ADMIN_USERNAME --os_url http://$Q_HOST:$Q_PORT --tenant_id $TENANT_ID net1 | grep ' id ' | get_field 2)
+
+ # Create a subnet
+ quantum subnet-create --os_token $Q_ADMIN_USERNAME --os_url http://$Q_HOST:$Q_PORT --tenant_id $TENANT_ID --ip_version 4 --gateway $NETWORK_GATEWAY $NET_ID $FIXED_RANGE
+ fi
fi
# Launching nova-compute should be as simple as running ``nova-compute`` but
diff --git a/tools/configure_tempest.sh b/tools/configure_tempest.sh
index bb995f8..22a8c43 100755
--- a/tools/configure_tempest.sh
+++ b/tools/configure_tempest.sh
@@ -95,9 +95,13 @@
# copy every time, because the image UUIDS are going to change
cp $TEMPEST_CONF.tpl $TEMPEST_CONF
-ADMIN_USERNAME=${ADMIN_USERNAME:-admin}
-ADMIN_PASSWORD=${ADMIN_PASSWORD:-secrete}
-ADMIN_TENANT_NAME=${ADMIN_TENANT:-admin}
+COMPUTE_ADMIN_USERNAME=${ADMIN_USERNAME:-admin}
+COMPUTE_ADMIN_PASSWORD=${ADMIN_PASSWORD:-secrete}
+COMPUTE_ADMIN_TENANT_NAME=${ADMIN_TENANT:-admin}
+
+IDENTITY_ADMIN_USERNAME=${ADMIN_USERNAME:-admin}
+IDENTITY_ADMIN_PASSWORD=${ADMIN_PASSWORD:-secrete}
+IDENTITY_ADMIN_TENANT_NAME=${ADMIN_TENANT:-admin}
IDENTITY_USE_SSL=${IDENTITY_USE_SSL:-False}
IDENTITY_HOST=${IDENTITY_HOST:-127.0.0.1}
@@ -107,6 +111,7 @@
# from the Tempest configuration file entirely...
IDENTITY_PATH=${IDENTITY_PATH:-tokens}
IDENTITY_STRATEGY=${IDENTITY_STRATEGY:-keystone}
+IDENTITY_CATALOG_TYPE=identity
# We use regular, non-admin users in Tempest for the USERNAME
# substitutions and use ADMIN_USERNAME et al for the admin stuff.
@@ -128,15 +133,26 @@
# Do any of the following need to be configurable?
COMPUTE_CATALOG_TYPE=compute
COMPUTE_CREATE_IMAGE_ENABLED=True
+COMPUTE_ALLOW_TENANT_ISOLATION=True
COMPUTE_RESIZE_AVAILABLE=False # not supported with QEMU...
COMPUTE_LOG_LEVEL=ERROR
-BUILD_INTERVAL=10
-BUILD_TIMEOUT=600
+BUILD_INTERVAL=3
+BUILD_TIMEOUT=400
+RUN_SSH=True
+SSH_USER=$OS_USERNAME
+NETWORK_FOR_SSH=private
+IP_VERSION_FOR_SSH=4
+SSH_TIMEOUT=4
# Image test configuration options...
IMAGE_HOST=${IMAGE_HOST:-127.0.0.1}
IMAGE_PORT=${IMAGE_PORT:-9292}
-IMAGE_API_VERSION="1"
+IMAGE_API_VERSION=1
+IMAGE_CATALOG_TYPE=image
+
+# Network API test configuration
+NETWORK_CATALOG_TYPE=network
+NETWORK_API_VERSION=2.0
sed -e "
s,%IDENTITY_USE_SSL%,$IDENTITY_USE_SSL,g;
@@ -145,6 +161,7 @@
s,%IDENTITY_API_VERSION%,$IDENTITY_API_VERSION,g;
s,%IDENTITY_PATH%,$IDENTITY_PATH,g;
s,%IDENTITY_STRATEGY%,$IDENTITY_STRATEGY,g;
+ s,%IDENTITY_CATALOG_TYPE%,$IDENTITY_CATALOG_TYPE,g;
s,%USERNAME%,$OS_USERNAME,g;
s,%PASSWORD%,$OS_PASSWORD,g;
s,%TENANT_NAME%,$OS_TENANT_NAME,g;
@@ -152,11 +169,17 @@
s,%ALT_PASSWORD%,$ALT_PASSWORD,g;
s,%ALT_TENANT_NAME%,$ALT_TENANT_NAME,g;
s,%COMPUTE_CATALOG_TYPE%,$COMPUTE_CATALOG_TYPE,g;
+ s,%COMPUTE_ALLOW_TENANT_ISOLATION%,$COMPUTE_ALLOW_TENANT_ISOLATION,g;
s,%COMPUTE_CREATE_IMAGE_ENABLED%,$COMPUTE_CREATE_IMAGE_ENABLED,g;
s,%COMPUTE_RESIZE_AVAILABLE%,$COMPUTE_RESIZE_AVAILABLE,g;
s,%COMPUTE_LOG_LEVEL%,$COMPUTE_LOG_LEVEL,g;
s,%BUILD_INTERVAL%,$BUILD_INTERVAL,g;
s,%BUILD_TIMEOUT%,$BUILD_TIMEOUT,g;
+ s,%RUN_SSH%,$RUN_SSH,g;
+ s,%SSH_USER%,$SSH_USER,g;
+ s,%NETWORK_FOR_SSH%,$NETWORK_FOR_SSH,g;
+ s,%IP_VERSION_FOR_SSH%,$IP_VERSION_FOR_SSH,g;
+ s,%SSH_TIMEOUT%,$SSH_TIMEOUT,g;
s,%IMAGE_ID%,$IMAGE_UUID,g;
s,%IMAGE_ID_ALT%,$IMAGE_UUID_ALT,g;
s,%FLAVOR_REF%,$FLAVOR_REF,g;
@@ -164,13 +187,15 @@
s,%IMAGE_HOST%,$IMAGE_HOST,g;
s,%IMAGE_PORT%,$IMAGE_PORT,g;
s,%IMAGE_API_VERSION%,$IMAGE_API_VERSION,g;
- s,%COMPUTE_ADMIN_USERNAME%,$ADMIN_USERNAME,g;
- s,%COMPUTE_ADMIN_PASSWORD%,$ADMIN_PASSWORD,g;
- s,%COMPUTE_ADMIN_TENANT_NAME%,$ADMIN_TENANT_NAME,g;
- s,%IDENTITY_ADMIN_USERNAME%,$ADMIN_USERNAME,g;
- s,%IDENTITY_ADMIN_PASSWORD%,$ADMIN_PASSWORD,g;
- s,%IDENTITY_ADMIN_TENANT_NAME%,$ADMIN_TENANT_NAME,g;
- s,%COMPUTE_ALLOW_TENANT_ISOLATION%,true,g;
+ s,%IMAGE_CATALOG_TYPE%,$IMAGE_CATALOG_TYPE,g;
+ s,%COMPUTE_ADMIN_USERNAME%,$COMPUTE_ADMIN_USERNAME,g;
+ s,%COMPUTE_ADMIN_PASSWORD%,$COMPUTE_ADMIN_PASSWORD,g;
+ s,%COMPUTE_ADMIN_TENANT_NAME%,$COMPUTE_ADMIN_TENANT_NAME,g;
+ s,%IDENTITY_ADMIN_USERNAME%,$IDENTITY_ADMIN_USERNAME,g;
+ s,%IDENTITY_ADMIN_PASSWORD%,$IDENTITY_ADMIN_PASSWORD,g;
+ s,%IDENTITY_ADMIN_TENANT_NAME%,$IDENTITY_ADMIN_TENANT_NAME,g;
+ s,%NETWORK_CATALOG_TYPE%,$NETWORK_CATALOG_TYPE,g;
+ s,%NETWORK_API_VERSION%,$NETWORK_API_VERSION,g;
" -i $TEMPEST_CONF
echo "Created tempest configuration file:"
diff --git a/tools/info.sh b/tools/info.sh
index bdca06e..bf40e82 100755
--- a/tools/info.sh
+++ b/tools/info.sh
@@ -28,6 +28,9 @@
TOP_DIR=$(cd $TOOLS_DIR/..; pwd)
cd $TOP_DIR
+# Import common functions
+source $TOP_DIR/functions
+
# Source params
source $TOP_DIR/stackrc
@@ -38,6 +41,21 @@
exit 1
fi
+
+# OS
+# --
+
+# Determine what OS we're using
+GetDistro
+
+echo "os|distro=$DISTRO"
+echo "os|vendor=$os_VENDOR"
+echo "os|release=$os_RELEASE"
+if [ -n "$os_UPDATE" ]; then
+ echo "os|version=$os_UPDATE"
+fi
+
+
# Repos
# -----
@@ -62,123 +80,44 @@
fi
done
-# OS
-# --
-
-GetOSInfo() {
- # Figure out which vedor we are
- if [ -r /etc/lsb-release ]; then
- . /etc/lsb-release
- VENDORNAME=$DISTRIB_ID
- RELEASE=$DISTRIB_RELEASE
- else
- for r in RedHat CentOS Fedora; do
- VENDORPKG="`echo $r | tr [:upper:] [:lower:]`-release"
- VENDORNAME=$r
- RELEASE=`rpm -q --queryformat '%{VERSION}' $VENDORPKG`
- if [ $? = 0 ]; then
- break
- fi
- VENDORNAME=""
- done
- # Get update level
- if [ -n "`grep Update /etc/redhat-release`" ]; then
- # Get update
- UPDATE=`cat /etc/redhat-release | sed s/.*Update\ // | sed s/\)$//`
- else
- # Assume update 0
- UPDATE=0
- fi
- fi
-
- echo "os|vendor=$VENDORNAME"
- echo "os|release=$RELEASE"
- if [ -n "$UPDATE" ]; then
- echo "os|version=$UPDATE"
- fi
-}
-
-GetOSInfo
# Packages
# --------
# - We are going to check packages only for the services needed.
# - We are parsing the packages files and detecting metadatas.
-# - If we have the meta-keyword dist:DISTRO or
-# dist:DISTRO1,DISTRO2 it will be installed only for those
-# distros (case insensitive).
-function get_packages() {
- local file_to_parse="general"
- local service
- for service in ${ENABLED_SERVICES//,/ }; do
- # Allow individual services to specify dependencies
- if [[ -e $FILES/apts/${service} ]]; then
- file_to_parse="${file_to_parse} $service"
- fi
- if [[ $service == n-* ]]; then
- if [[ ! $file_to_parse =~ nova ]]; then
- file_to_parse="${file_to_parse} nova"
- fi
- elif [[ $service == g-* ]]; then
- if [[ ! $file_to_parse =~ glance ]]; then
- file_to_parse="${file_to_parse} glance"
- fi
- elif [[ $service == key* ]]; then
- if [[ ! $file_to_parse =~ keystone ]]; then
- file_to_parse="${file_to_parse} keystone"
- fi
- fi
- done
+if [[ "$os_PACKAGE" = "deb" ]]; then
+ PKG_DIR=$FILES/apts
+else
+ PKG_DIR=$FILES/rpms
+fi
- for file in ${file_to_parse}; do
- local fname=${FILES}/apts/${file}
- local OIFS line package distros distro
- [[ -e $fname ]] || { echo "missing: $fname"; exit 1; }
-
- OIFS=$IFS
- IFS=$'\n'
- for line in $(<${fname}); do
- if [[ $line =~ (.*)#.*dist:([^ ]*) ]]; then # We are using BASH regexp matching feature.
- package=${BASH_REMATCH[1]}
- distros=${BASH_REMATCH[2]}
- for distro in ${distros//,/ }; do #In bash ${VAR,,} will lowecase VAR
- [[ ${distro,,} == ${DISTRO,,} ]] && echo $package
- done
- continue
- fi
-
- echo ${line%#*}
- done
- IFS=$OIFS
- done
-}
-
-for p in $(get_packages); do
- ver=$(dpkg -s $p 2>/dev/null | grep '^Version: ' | cut -d' ' -f2)
+for p in $(get_packages $PKG_DIR); do
+ if [[ "$os_PACKAGE" = "deb" ]]; then
+ ver=$(dpkg -s $p 2>/dev/null | grep '^Version: ' | cut -d' ' -f2)
+ else
+ ver=$(rpm -q --queryformat "%{VERSION}-%{RELEASE}\n" $p)
+ fi
echo "pkg|${p}|${ver}"
done
+
# Pips
# ----
-function get_pips() {
- cat $FILES/pips/* | uniq
-}
+if [[ "$os_PACKAGE" = "deb" ]]; then
+ CMD_PIP=/usr/bin/pip
+else
+ CMD_PIP=/usr/bin/pip-python
+fi
# Pip tells us what is currently installed
FREEZE_FILE=$(mktemp --tmpdir freeze.XXXXXX)
-pip freeze >$FREEZE_FILE 2>/dev/null
+$CMD_PIP freeze >$FREEZE_FILE 2>/dev/null
# Loop through our requirements and look for matches
-for p in $(get_pips); do
- [[ "$p" = "-e" ]] && continue
- if [[ "$p" =~ \+?([^#]*)#? ]]; then
- # Get the URL from a remote reference
- p=${BASH_REMATCH[1]}
- fi
- line="`grep -i $p $FREEZE_FILE`"
+while read line; do
if [[ -n "$line" ]]; then
if [[ "$line" =~ \+(.*)@(.*)#egg=(.*) ]]; then
# Handle URLs
@@ -199,10 +138,11 @@
#echo "unknown: $p"
continue
fi
-done
+done <$FREEZE_FILE
rm $FREEZE_FILE
+
# localrc
# -------
@@ -212,5 +152,5 @@
/PASSWORD/d;
/^#/d;
s/^/localrc\|/;
- ' $TOP_DIR/localrc | sort
+ ' $TOP_DIR/localrc
fi
diff --git a/tools/xen/install_os_domU.sh b/tools/xen/install_os_domU.sh
index 352f63a..19453c1 100755
--- a/tools/xen/install_os_domU.sh
+++ b/tools/xen/install_os_domU.sh
@@ -57,8 +57,9 @@
fi
# get nova
-wget https://github.com/openstack/nova/zipball/master --no-check-certificate
-unzip -o master -d ./nova
+nova_zipball=$(echo $NOVA_REPO | sed "s:\.git$::;s:$:/zipball/$NOVA_BRANCH:g")
+wget $nova_zipball -O nova-zipball --no-check-certificate
+unzip -o nova-zipball -d ./nova
# install xapi plugins
XAPI_PLUGIN_DIR=/etc/xapi.d/plugins/