Merge "Updated deprecated keystone_authtoken option"
diff --git a/.gitignore b/.gitignore
index a5a17c2..c72b0c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,5 @@
src
stack-screenrc
userrc_early
+AUTHORS
+ChangeLog
diff --git a/README.md b/README.md
index dd394c2..4ba4619 100644
--- a/README.md
+++ b/README.md
@@ -61,13 +61,6 @@
# list instances
nova list
-If the EC2 API is your cup-o-tea, you can create credentials and use euca2ools:
-
- # source eucarc to generate EC2 credentials and set up the environment
- . eucarc
- # list instances using ec2 api
- euca-describe-instances
-
# DevStack Execution Environment
DevStack runs rampant over the system it runs on, installing things and
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index e985bdc..0493f8f 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -104,7 +104,7 @@
::
[[local|localrc]]
- ADMIN_PASSWORD=secrete
+ ADMIN_PASSWORD=secret
DATABASE_PASSWORD=$ADMIN_PASSWORD
RABBIT_PASSWORD=$ADMIN_PASSWORD
SERVICE_PASSWORD=$ADMIN_PASSWORD
diff --git a/doc/source/eucarc.rst b/doc/source/eucarc.rst
deleted file mode 100644
index c2ecbc6..0000000
--- a/doc/source/eucarc.rst
+++ /dev/null
@@ -1,45 +0,0 @@
-=====================
-eucarc - EC2 Settings
-=====================
-
-``eucarc`` creates EC2 credentials for the current user as defined by
-``OS_TENANT_NAME:OS_USERNAME``. ``eucarc`` sources ``openrc`` at the
-beginning (which in turn sources ``stackrc`` and ``localrc``) in order
-to set credentials to create EC2 credentials in Keystone.
-
-EC2\_URL
- Set the EC2 url for euca2ools. The endpoint is extracted from the
- service catalog for ``OS_TENANT_NAME:OS_USERNAME``.
-
- ::
-
- EC2_URL=$(openstack catalog show ec2 | awk '/ publicURL: / { print $4 }')
-
-S3\_URL
- Set the S3 endpoint for euca2ools. The endpoint is extracted from
- the service catalog for ``OS_TENANT_NAME:OS_USERNAME``.
-
- ::
-
- export S3_URL=$(openstack catalog show s3 | awk '/ publicURL: / { print $4 }')
-
-EC2\_ACCESS\_KEY, EC2\_SECRET\_KEY
- Create EC2 credentials for the current tenant:user in Keystone.
-
- ::
-
- CREDS=$(openstack ec2 credentials create)
- export EC2_ACCESS_KEY=$(echo "$CREDS" | awk '/ access / { print $4 }')
- export EC2_SECRET_KEY=$(echo "$CREDS" | awk '/ secret / { print $4 }')
-
-Certificates for Bundling
- Euca2ools requires certificate files to enable bundle uploading. The
- exercise script ``exercises/bundle.sh`` demonstrated retrieving
- certificates using the Nova CLI.
-
- ::
-
- EC2_PRIVATE_KEY=pk.pem
- EC2_CERT=cert.pem
- NOVA_CERT=cacert.pem
- EUCALYPTUS_CERT=${NOVA_CERT}
diff --git a/doc/source/guides/multinode-lab.rst b/doc/source/guides/multinode-lab.rst
index 392bb1b..c996f95 100644
--- a/doc/source/guides/multinode-lab.rst
+++ b/doc/source/guides/multinode-lab.rst
@@ -129,8 +129,8 @@
LOGFILE=/opt/stack/logs/stack.sh.log
ADMIN_PASSWORD=labstack
DATABASE_PASSWORD=supersecret
- RABBIT_PASSWORD=supersecrete
- SERVICE_PASSWORD=supersecrete
+ RABBIT_PASSWORD=supersecret
+ SERVICE_PASSWORD=supersecret
In the multi-node configuration the first 10 or so IPs in the private
subnet are usually reserved. Add this to ``local.sh`` to have it run
@@ -169,8 +169,8 @@
LOGFILE=/opt/stack/logs/stack.sh.log
ADMIN_PASSWORD=labstack
DATABASE_PASSWORD=supersecret
- RABBIT_PASSWORD=supersecrete
- SERVICE_PASSWORD=supersecrete
+ RABBIT_PASSWORD=supersecret
+ SERVICE_PASSWORD=supersecret
DATABASE_TYPE=mysql
SERVICE_HOST=192.168.42.11
MYSQL_HOST=$SERVICE_HOST
@@ -254,7 +254,7 @@
# Add a user and project
NAME=bob
- PASSWORD=BigSecrete
+ PASSWORD=BigSecret
PROJECT=$NAME
openstack project create $PROJECT
openstack user create $NAME --password=$PASSWORD --project $PROJECT
diff --git a/doc/source/guides/neutron.rst b/doc/source/guides/neutron.rst
index c8b5c44..4406aa0 100644
--- a/doc/source/guides/neutron.rst
+++ b/doc/source/guides/neutron.rst
@@ -59,10 +59,10 @@
MYSQL_HOST=172.18.161.6
RABBIT_HOST=172.18.161.6
GLANCE_HOSTPORT=172.18.161.6:9292
- ADMIN_PASSWORD=secrete
- DATABASE_PASSWORD=secrete
- RABBIT_PASSWORD=secrete
- SERVICE_PASSWORD=secrete
+ ADMIN_PASSWORD=secret
+ DATABASE_PASSWORD=secret
+ RABBIT_PASSWORD=secret
+ SERVICE_PASSWORD=secret
# Do not use Nova-Network
disable_service n-net
@@ -232,10 +232,10 @@
MYSQL_HOST=172.18.161.6
RABBIT_HOST=172.18.161.6
GLANCE_HOSTPORT=172.18.161.6:9292
- ADMIN_PASSWORD=secrete
- MYSQL_PASSWORD=secrete
- RABBIT_PASSWORD=secrete
- SERVICE_PASSWORD=secrete
+ ADMIN_PASSWORD=secret
+ MYSQL_PASSWORD=secret
+ RABBIT_PASSWORD=secret
+ SERVICE_PASSWORD=secret
## Neutron options
PUBLIC_INTERFACE=eth0
@@ -362,10 +362,10 @@
GLANCE_HOSTPORT=10.0.0.2:9292
PUBLIC_INTERFACE=eth1
- ADMIN_PASSWORD=secrete
- MYSQL_PASSWORD=secrete
- RABBIT_PASSWORD=secrete
- SERVICE_PASSWORD=secrete
+ ADMIN_PASSWORD=secret
+ MYSQL_PASSWORD=secret
+ RABBIT_PASSWORD=secret
+ SERVICE_PASSWORD=secret
## Neutron options
Q_USE_SECGROUP=True
@@ -409,10 +409,10 @@
MYSQL_HOST=10.0.0.2
RABBIT_HOST=10.0.0.2
GLANCE_HOSTPORT=10.0.0.2:9292
- ADMIN_PASSWORD=secrete
- MYSQL_PASSWORD=secrete
- RABBIT_PASSWORD=secrete
- SERVICE_PASSWORD=secrete
+ ADMIN_PASSWORD=secret
+ MYSQL_PASSWORD=secret
+ RABBIT_PASSWORD=secret
+ SERVICE_PASSWORD=secret
# Services that a compute node runs
ENABLED_SERVICES=n-cpu,rabbit,q-agt
@@ -509,10 +509,10 @@
MYSQL_HOST=172.18.161.6
RABBIT_HOST=172.18.161.6
GLANCE_HOSTPORT=172.18.161.6:9292
- ADMIN_PASSWORD=secrete
- DATABASE_PASSWORD=secrete
- RABBIT_PASSWORD=secrete
- SERVICE_PASSWORD=secrete
+ ADMIN_PASSWORD=secret
+ DATABASE_PASSWORD=secret
+ RABBIT_PASSWORD=secret
+ SERVICE_PASSWORD=secret
# Do not use Nova-Network
disable_service n-net
@@ -537,18 +537,3 @@
PUBLIC_PHYSICAL_NETWORK=default
LB_INTERFACE_MAPPINGS=default:eth0
-Creating specific OVS bridges for physical networks
----------------------------------------------------
-
-When using the Open vSwitch ML2 mechanism driver, it is possible to
-have multiple Open vSwitch bridges meant for physical networking be
-automatically created by setting the ``OVS_BRIDGE_MAPPINGS`` to a list of
-physical network to bridge name associations with the following syntax:
-
-::
- OVS_BRIDGE_MAPPINGS=net1name:bridge1name,net2name:bridge2name,<...>
-
-Also, ``OVS_BRIDGE_MAPPINGS`` has precedence over ``PHYSICAL_NETWORK`` and
-``OVS_PHYSICAL_BRIDGE``, meaning that if the former is set, the latter
-ones will be ignored. When ``OVS_BRIDGE_MAPPINGS`` is not set, the other
-variables will still be evaluated.
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 3e324ad..c79b2ce 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -217,7 +217,6 @@
stackrc
openrc
exerciserc
- eucarc
Tools
-----
diff --git a/doc/source/openrc.rst b/doc/source/openrc.rst
index 0b090c7..4e7f075 100644
--- a/doc/source/openrc.rst
+++ b/doc/source/openrc.rst
@@ -35,7 +35,7 @@
::
- OS_PASSWORD=secrete
+ OS_PASSWORD=secret
HOST\_IP, SERVICE\_HOST
Set API endpoint host using ``HOST_IP``. ``SERVICE_HOST`` may also
diff --git a/doc/source/plugin-registry.rst b/doc/source/plugin-registry.rst
index 29b743f..136a9e4 100644
--- a/doc/source/plugin-registry.rst
+++ b/doc/source/plugin-registry.rst
@@ -32,6 +32,8 @@
+----------------------------+-------------------------------------------------------------------------+
|blazar |git://git.openstack.org/openstack/blazar |
+----------------------------+-------------------------------------------------------------------------+
+|broadview-collector |git://git.openstack.org/openstack/broadview-collector |
++----------------------------+-------------------------------------------------------------------------+
|ceilometer |git://git.openstack.org/openstack/ceilometer |
+----------------------------+-------------------------------------------------------------------------+
|ceilometer-powervm |git://git.openstack.org/openstack/ceilometer-powervm |
@@ -104,6 +106,8 @@
+----------------------------+-------------------------------------------------------------------------+
|networking-bgpvpn |git://git.openstack.org/openstack/networking-bgpvpn |
+----------------------------+-------------------------------------------------------------------------+
+|networking-brocade |git://git.openstack.org/openstack/networking-brocade |
++----------------------------+-------------------------------------------------------------------------+
|networking-calico |git://git.openstack.org/openstack/networking-calico |
+----------------------------+-------------------------------------------------------------------------+
|networking-cisco |git://git.openstack.org/openstack/networking-cisco |
@@ -192,31 +196,3 @@
+----------------------------+-------------------------------------------------------------------------+
|zaqar |git://git.openstack.org/openstack/zaqar |
+----------------------------+-------------------------------------------------------------------------+
-
-Drivers
-=======
-
-+--------------------+-------------------------------------------------+------------------+
-|Plugin Name |URL |Comments |
-+--------------------+-------------------------------------------------+------------------+
-|dragonflow |git://git.openstack.org/openstack/dragonflow |[d1]_ |
-+--------------------+-------------------------------------------------+------------------+
-|odl |git://git.openstack.org/openstack/networking-odl |[d2]_ |
-+--------------------+-------------------------------------------------+------------------+
-
-.. [d1] demonstrates example of installing 3rd party SDN controller
-.. [d2] demonstrates a pretty advanced set of modes that that allow
- one to run OpenDayLight either from a pre-existing install, or
- also from source
-
-Alternate Configs
-=================
-
-+-------------+------------------------------------------------------------+------------+
-| Plugin Name | URL | Comments |
-| | | |
-+-------------+------------------------------------------------------------+------------+
-|glusterfs |git://git.openstack.org/openstack/devstack-plugin-glusterfs | |
-+-------------+------------------------------------------------------------+------------+
-| | | |
-+-------------+------------------------------------------------------------+------------+
diff --git a/eucarc b/eucarc
deleted file mode 100644
index 1e672bd..0000000
--- a/eucarc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-#
-# source eucarc [username] [tenantname]
-#
-# Create EC2 credentials for the current user as defined by OS_TENANT_NAME:OS_USERNAME
-# Optionally set the tenant/username via openrc
-
-if [[ -n "$1" ]]; then
- USERNAME=$1
-fi
-if [[ -n "$2" ]]; then
- TENANT=$2
-fi
-
-# Find the other rc files
-RC_DIR=$(cd $(dirname "${BASH_SOURCE:-$0}") && pwd)
-
-# Get user configuration
-source $RC_DIR/openrc
-
-# Set the ec2 url so euca2ools works
-export EC2_URL=$(openstack catalog show ec2 | awk '/ publicURL: / { print $4 }')
-
-# Create EC2 credentials for the current user
-CREDS=$(openstack ec2 credentials create)
-export EC2_ACCESS_KEY=$(echo "$CREDS" | awk '/ access / { print $4 }')
-export EC2_SECRET_KEY=$(echo "$CREDS" | awk '/ secret / { print $4 }')
-
-# Euca2ools Certificate stuff for uploading bundles
-# See exercises/bundle.sh to see how to get certs using nova cli
-NOVA_KEY_DIR=${NOVA_KEY_DIR:-$RC_DIR}
-export S3_URL=$(openstack catalog show s3 | awk '/ publicURL: / { print $4 }')
-export EC2_USER_ID=42 # nova does not use user id, but bundling requires it
-export EC2_PRIVATE_KEY=${NOVA_KEY_DIR}/pk.pem
-export EC2_CERT=${NOVA_KEY_DIR}/cert.pem
-export NOVA_CERT=${NOVA_KEY_DIR}/cacert.pem
-export EUCALYPTUS_CERT=${NOVA_CERT} # euca-bundle-image seems to require this set
-alias ec2-bundle-image="ec2-bundle-image --cert ${EC2_CERT} --privatekey ${EC2_PRIVATE_KEY} --user ${EC2_USER_ID} --ec2cert ${NOVA_CERT}"
-alias ec2-upload-bundle="ec2-upload-bundle -a ${EC2_ACCESS_KEY} -s ${EC2_SECRET_KEY} --url ${S3_URL} --ec2cert ${NOVA_CERT}"
-
diff --git a/exercise.sh b/exercise.sh
index 19c9d80..9067033 100755
--- a/exercise.sh
+++ b/exercise.sh
@@ -14,11 +14,11 @@
# Run everything in the exercises/ directory that isn't explicitly disabled
# comma separated list of script basenames to skip
-# to refrain from exercising euca.sh use ``SKIP_EXERCISES=euca``
+# to refrain from exercising foo.sh use ``SKIP_EXERCISES=foo``
SKIP_EXERCISES=${SKIP_EXERCISES:-""}
# comma separated list of script basenames to run
-# to run only euca.sh use ``RUN_EXERCISES=euca``
+# to run only foo.sh use ``RUN_EXERCISES=foo``
basenames=${RUN_EXERCISES:-""}
EXERCISE_DIR=$TOP_DIR/exercises
diff --git a/exerciserc b/exerciserc
index 9105fe3..978e0b3 100644
--- a/exerciserc
+++ b/exerciserc
@@ -21,12 +21,6 @@
# Max time to wait for a vm to terminate
export TERMINATE_TIMEOUT=${TERMINATE_TIMEOUT:-30}
-# Max time to wait for a euca-volume command to propagate
-export VOLUME_TIMEOUT=${VOLUME_TIMEOUT:-30}
-
-# Max time to wait for a euca-delete command to propagate
-export VOLUME_DELETE_TIMEOUT=${SNAPSHOT_DELETE_TIMEOUT:-60}
-
# The size of the volume we want to boot from; some storage back-ends
# do not allow a disk resize, so it's important that this can be tuned
export DEFAULT_VOLUME_SIZE=${DEFAULT_VOLUME_SIZE:-1}
diff --git a/exercises/bundle.sh b/exercises/bundle.sh
deleted file mode 100755
index 5470960..0000000
--- a/exercises/bundle.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/env bash
-
-# **bundle.sh**
-
-# we will use the ``euca2ools`` cli tool that wraps the python boto
-# library to test ec2 bundle upload compatibility
-
-echo "*********************************************************************"
-echo "Begin DevStack Exercise: $0"
-echo "*********************************************************************"
-
-# This script exits on an error so that errors don't compound and you see
-# only the first error that occurred.
-set -o errexit
-
-# Print the commands being run so that we can see the command that triggers
-# an error. It is also useful for following allowing as the install occurs.
-set -o xtrace
-
-
-# Settings
-# ========
-
-# Keep track of the current directory
-EXERCISE_DIR=$(cd $(dirname "$0") && pwd)
-TOP_DIR=$(cd $EXERCISE_DIR/..; pwd)
-
-# Import common functions
-source $TOP_DIR/functions
-
-# Import EC2 configuration
-source $TOP_DIR/eucarc
-
-# Import exercise configuration
-source $TOP_DIR/exerciserc
-
-# Remove old certificates
-rm -f $TOP_DIR/cacert.pem
-rm -f $TOP_DIR/cert.pem
-rm -f $TOP_DIR/pk.pem
-
-# If nova api is not enabled we exit with exitcode 55 so that
-# the exercise is skipped
-is_service_enabled n-api || exit 55
-
-# Get Certificates
-nova x509-get-root-cert $TOP_DIR/cacert.pem
-nova x509-create-cert $TOP_DIR/pk.pem $TOP_DIR/cert.pem
-
-# Max time to wait for image to be registered
-REGISTER_TIMEOUT=${REGISTER_TIMEOUT:-15}
-
-BUCKET=testbucket
-IMAGE=bundle.img
-truncate -s 5M /tmp/$IMAGE
-euca-bundle-image -i /tmp/$IMAGE || die $LINENO "Failure bundling image $IMAGE"
-
-euca-upload-bundle --debug -b $BUCKET -m /tmp/$IMAGE.manifest.xml || die $LINENO "Failure uploading bundle $IMAGE to $BUCKET"
-
-AMI=`euca-register $BUCKET/$IMAGE.manifest.xml | cut -f2`
-die_if_not_set $LINENO AMI "Failure registering $BUCKET/$IMAGE"
-
-# Wait for the image to become available
-if ! timeout $REGISTER_TIMEOUT sh -c "while euca-describe-images | grep $AMI | grep -q available; do sleep 1; done"; then
- die $LINENO "Image $AMI not available within $REGISTER_TIMEOUT seconds"
-fi
-
-# Clean up
-euca-deregister $AMI || die $LINENO "Failure deregistering $AMI"
-
-set +o xtrace
-echo "*********************************************************************"
-echo "SUCCESS: End DevStack Exercise: $0"
-echo "*********************************************************************"
diff --git a/exercises/client-args.sh b/exercises/client-args.sh
index 07ce528..2c8fe81 100755
--- a/exercises/client-args.sh
+++ b/exercises/client-args.sh
@@ -83,7 +83,6 @@
if [[ "$ENABLED_SERVICES" =~ "n-api" ]]; then
if [[ "$SKIP_EXERCISES" =~ "n-api" ]]; then
STATUS_NOVA="Skipped"
- STATUS_EC2="Skipped"
else
# Test OSAPI
echo -e "\nTest Nova"
diff --git a/exercises/client-env.sh b/exercises/client-env.sh
index 1d2f4f5..6ab4d08 100755
--- a/exercises/client-env.sh
+++ b/exercises/client-env.sh
@@ -78,7 +78,6 @@
if [[ "$ENABLED_SERVICES" =~ "n-api" ]]; then
if [[ "$SKIP_EXERCISES" =~ "n-api" ]]; then
STATUS_NOVA="Skipped"
- STATUS_EC2="Skipped"
else
# Test OSAPI
echo -e "\nTest Nova"
@@ -89,17 +88,6 @@
RETURN=1
fi
- # Test EC2 API
- echo -e "\nTest EC2"
- # Get EC2 creds
- source $TOP_DIR/eucarc
-
- if euca-describe-images; then
- STATUS_EC2="Succeeded"
- else
- STATUS_EC2="Failed"
- RETURN=1
- fi
fi
fi
@@ -170,7 +158,6 @@
echo -e "\n"
report "Keystone" $STATUS_KEYSTONE
report "Nova" $STATUS_NOVA
-report "EC2" $STATUS_EC2
report "Cinder" $STATUS_CINDER
report "Glance" $STATUS_GLANCE
report "Swift" $STATUS_SWIFT
diff --git a/exercises/euca.sh b/exercises/euca.sh
deleted file mode 100755
index 60e7d8c..0000000
--- a/exercises/euca.sh
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/usr/bin/env bash
-
-# **euca.sh**
-
-# we will use the ``euca2ools`` cli tool that wraps the python boto
-# library to test ec2 compatibility
-
-echo "*********************************************************************"
-echo "Begin DevStack Exercise: $0"
-echo "*********************************************************************"
-
-# This script exits on an error so that errors don't compound and you see
-# only the first error that occurred.
-set -o errexit
-
-# Print the commands being run so that we can see the command that triggers
-# an error. It is also useful for following allowing as the install occurs.
-set -o xtrace
-
-# Settings
-# ========
-
-# Keep track of the current directory
-EXERCISE_DIR=$(cd $(dirname "$0") && pwd)
-TOP_DIR=$(cd $EXERCISE_DIR/..; pwd)
-VOLUME_SIZE=1
-ATTACH_DEVICE=/dev/vdc
-
-# Import common functions
-source $TOP_DIR/functions
-
-# Import EC2 configuration
-source $TOP_DIR/eucarc
-
-# Import exercise configuration
-source $TOP_DIR/exerciserc
-
-# Import project functions
-source $TOP_DIR/lib/neutron-legacy
-
-# If nova api is not enabled we exit with exitcode 55 so that
-# the exercise is skipped
-is_service_enabled n-api || exit 55
-
-# Instance type to create
-DEFAULT_INSTANCE_TYPE=${DEFAULT_INSTANCE_TYPE:-m1.tiny}
-
-# Boot this image, use first AMI image if unset
-DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-ami}
-
-# Security group name
-SECGROUP=${SECGROUP:-euca_secgroup}
-
-
-# Launching a server
-# ==================
-
-# Find a machine image to boot
-IMAGE=`euca-describe-images | grep machine | grep ${DEFAULT_IMAGE_NAME} | cut -f2 | head -n1`
-die_if_not_set $LINENO IMAGE "Failure getting image $DEFAULT_IMAGE_NAME"
-
-if is_service_enabled n-cell; then
- # Cells does not support security groups, so force the use of "default"
- SECGROUP="default"
- echo "Using the default security group because of Cells."
-else
- # Add a secgroup
- if ! euca-describe-groups | grep -q $SECGROUP; then
- euca-add-group -d "$SECGROUP description" $SECGROUP
- if ! timeout $ASSOCIATE_TIMEOUT sh -c "while ! euca-describe-groups | grep -q $SECGROUP; do sleep 1; done"; then
- die $LINENO "Security group not created"
- fi
- fi
-fi
-
-# Launch it
-INSTANCE=`euca-run-instances -g $SECGROUP -t $DEFAULT_INSTANCE_TYPE $IMAGE | grep INSTANCE | cut -f2`
-die_if_not_set $LINENO INSTANCE "Failure launching instance"
-
-# Assure it has booted within a reasonable time
-if ! timeout $RUNNING_TIMEOUT sh -c "while ! euca-describe-instances $INSTANCE | grep -q running; do sleep 1; done"; then
- die $LINENO "server didn't become active within $RUNNING_TIMEOUT seconds"
-fi
-
-# Volumes
-# -------
-if is_service_enabled c-vol && ! is_service_enabled n-cell && [ "$VIRT_DRIVER" != "ironic" ]; then
- VOLUME_ZONE=`euca-describe-availability-zones | head -n1 | cut -f2`
- die_if_not_set $LINENO VOLUME_ZONE "Failure to find zone for volume"
-
- VOLUME=`euca-create-volume -s 1 -z $VOLUME_ZONE` || die $LINENO "Failure to create volume"
- VOLUME=`echo "$VOLUME" | cut -f2`
- die_if_not_set $LINENO VOLUME "Failure to create volume"
-
- # Test that volume has been created
- VOLUME=`euca-describe-volumes $VOLUME | cut -f2`
- die_if_not_set $LINENO VOLUME "Failure to get volume"
-
- # Test volume has become available
- if ! timeout $RUNNING_TIMEOUT sh -c "while ! euca-describe-volumes $VOLUME | grep -q available; do sleep 1; done"; then
- die $LINENO "volume didn't become available within $RUNNING_TIMEOUT seconds"
- fi
-
- # Attach volume to an instance
- euca-attach-volume -i $INSTANCE -d $ATTACH_DEVICE $VOLUME || \
- die $LINENO "Failure attaching volume $VOLUME to $INSTANCE"
- if ! timeout $ACTIVE_TIMEOUT sh -c "while ! euca-describe-volumes $VOLUME | grep -A 1 in-use | grep -q attach; do sleep 1; done"; then
- die $LINENO "Could not attach $VOLUME to $INSTANCE"
- fi
-
- # Detach volume from an instance
- euca-detach-volume $VOLUME || \
- die $LINENO "Failure detaching volume $VOLUME to $INSTANCE"
- if ! timeout $ACTIVE_TIMEOUT sh -c "while ! euca-describe-volumes $VOLUME | grep -q available; do sleep 1; done"; then
- die $LINENO "Could not detach $VOLUME to $INSTANCE"
- fi
-
- # Remove volume
- euca-delete-volume $VOLUME || \
- die $LINENO "Failure to delete volume"
- if ! timeout $ACTIVE_TIMEOUT sh -c "while euca-describe-volumes | grep $VOLUME; do sleep 1; done"; then
- die $LINENO "Could not delete $VOLUME"
- fi
-else
- echo "Volume Tests Skipped"
-fi
-
-if is_service_enabled n-cell; then
- echo "Floating IP Tests Skipped because of Cells."
-else
- # Allocate floating address
- FLOATING_IP=`euca-allocate-address | cut -f2`
- die_if_not_set $LINENO FLOATING_IP "Failure allocating floating IP"
- # describe all instances at this moment
- euca-describe-instances
- # Associate floating address
- euca-associate-address -i $INSTANCE $FLOATING_IP || \
- die $LINENO "Failure associating address $FLOATING_IP to $INSTANCE"
-
- # Authorize pinging
- euca-authorize -P icmp -s 0.0.0.0/0 -t -1:-1 $SECGROUP || \
- die $LINENO "Failure authorizing rule in $SECGROUP"
-
- # Test we can ping our floating ip within ASSOCIATE_TIMEOUT seconds
- ping_check $FLOATING_IP $ASSOCIATE_TIMEOUT "$PUBLIC_NETWORK_NAME"
-
- # Revoke pinging
- euca-revoke -P icmp -s 0.0.0.0/0 -t -1:-1 $SECGROUP || \
- die $LINENO "Failure revoking rule in $SECGROUP"
-
- # Release floating address
- euca-disassociate-address $FLOATING_IP || \
- die $LINENO "Failure disassociating address $FLOATING_IP"
-
- # Wait just a tick for everything above to complete so release doesn't fail
- if ! timeout $ASSOCIATE_TIMEOUT sh -c "while euca-describe-addresses | grep $INSTANCE | grep -q $FLOATING_IP; do sleep 1; done"; then
- die $LINENO "Floating ip $FLOATING_IP not disassociated within $ASSOCIATE_TIMEOUT seconds"
- fi
-
- # Release floating address
- euca-release-address $FLOATING_IP || \
- die $LINENO "Failure releasing address $FLOATING_IP"
-
- # Wait just a tick for everything above to complete so terminate doesn't fail
- if ! timeout $ASSOCIATE_TIMEOUT sh -c "while euca-describe-addresses | grep -q $FLOATING_IP; do sleep 1; done"; then
- die $LINENO "Floating ip $FLOATING_IP not released within $ASSOCIATE_TIMEOUT seconds"
- fi
-fi
-
-# Terminate instance
-euca-terminate-instances $INSTANCE || \
- die $LINENO "Failure terminating instance $INSTANCE"
-
-# Assure it has terminated within a reasonable time. The behaviour of this
-# case changed with bug/836978. Requesting the status of an invalid instance
-# will now return an error message including the instance id, so we need to
-# filter that out.
-if ! timeout $TERMINATE_TIMEOUT sh -c "while euca-describe-instances $INSTANCE | grep -ve '\(InstanceNotFound\|InvalidInstanceID\.NotFound\)' | grep -q $INSTANCE; do sleep 1; done"; then
- die $LINENO "server didn't terminate within $TERMINATE_TIMEOUT seconds"
-fi
-
-if [[ "$SECGROUP" = "default" ]] ; then
- echo "Skipping deleting default security group"
-else
- # Delete secgroup
- euca-delete-group $SECGROUP || die $LINENO "Failure deleting security group $SECGROUP"
-fi
-
-set +o xtrace
-echo "*********************************************************************"
-echo "SUCCESS: End DevStack Exercise: $0"
-echo "*********************************************************************"
diff --git a/files/debs/general b/files/debs/general
index 1215147..307cd7b 100644
--- a/files/debs/general
+++ b/files/debs/general
@@ -28,6 +28,7 @@
tar
tcpdump
unzip
+uuid-runtime
wget
wget
zlib1g-dev
diff --git a/files/debs/neutron b/files/debs/neutron
index e53cc68..2307fa5 100644
--- a/files/debs/neutron
+++ b/files/debs/neutron
@@ -13,5 +13,4 @@
radvd # NOPRIME
sqlite3
sudo
-uuid-runtime
vlan
diff --git a/files/rpms-suse/general b/files/rpms-suse/general
index 34a2955..e3dfec1 100644
--- a/files/rpms-suse/general
+++ b/files/rpms-suse/general
@@ -2,7 +2,6 @@
bridge-utils
ca-certificates-mozilla
curl
-euca2ools
gcc
gcc-c++
git-core
diff --git a/files/rpms/general b/files/rpms/general
index a0906e2..6d5fd15 100644
--- a/files/rpms/general
+++ b/files/rpms/general
@@ -2,7 +2,6 @@
bridge-utils
curl
dbus
-euca2ools # only for testing client
gcc
gcc-c++
gettext # used for compiling message catalogs
diff --git a/functions-common b/functions-common
index 9e6fef2..5ae9745 100644
--- a/functions-common
+++ b/functions-common
@@ -312,20 +312,20 @@
# user if not available. Note can't use generic install_package*
# because they depend on this!
function _ensure_lsb_release {
- if [[ -x $(which lsb_release 2>/dev/null) ]]; then
+ if [[ -x $(command -v lsb_release 2>/dev/null) ]]; then
return
fi
- if [[ -x $(which apt-get 2>/dev/null) ]]; then
+ if [[ -x $(command -v apt-get 2>/dev/null) ]]; then
sudo apt-get install -y lsb-release
- elif [[ -x $(which zypper 2>/dev/null) ]]; then
+ elif [[ -x $(command -v zypper 2>/dev/null) ]]; then
# XXX: old code paths seem to have assumed SUSE platforms also
# had "yum". Keep this ordered above yum so we don't try to
# install the rh package. suse calls it just "lsb"
sudo zypper -n install lsb
- elif [[ -x $(which dnf 2>/dev/null) ]]; then
+ elif [[ -x $(command -v dnf 2>/dev/null) ]]; then
sudo dnf install -y redhat-lsb-core
- elif [[ -x $(which yum 2>/dev/null) ]]; then
+ elif [[ -x $(command -v yum 2>/dev/null) ]]; then
# all rh patforms (fedora, centos, rhel) have this pkg
sudo yum install -y redhat-lsb-core
else
@@ -440,6 +440,7 @@
fi
[ "$os_VENDOR" = "Fedora" ] || [ "$os_VENDOR" = "Red Hat" ] || \
+ [ "$os_VENDOR" = "RedHatEnterpriseServer" ] || \
[ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "OracleLinux" ] || \
[ "$os_VENDOR" = "Virtuozzo" ] || [ "$os_VENDOR" = "kvmibm" ]
}
@@ -1306,7 +1307,7 @@
elif is_fedora; then
sudo ${YUM:-yum} remove -y "$@" ||:
elif is_suse; then
- sudo zypper rm "$@"
+ sudo zypper rm "$@" ||:
else
exit_distro_not_supported "uninstalling packages"
fi
@@ -1322,28 +1323,36 @@
time_start "yum_install"
- # Warning: this would not work if yum output message
- # have been translated to another language
- parse_yum_result='\
- BEGIN { result=0 }\
- /^YUM_FAILED/ { exit $2 }\
- /^No package/ { result=1 }\
- //{ print }\
+ # - We run with LC_ALL=C so string matching *should* be OK
+ # - Exit 1 if the failure might get better with a retry.
+ # - Exit 2 if it is fatal.
+ parse_yum_result=' \
+ BEGIN { result=0 } \
+ /^YUM_FAILED/ { exit $2 } \
+ /^No package/ { result=2 } \
+ /^Failed:/ { result=2 } \
+ //{ print } \
END { exit result }'
# The manual check for missing packages is because yum -y assumes
- # missing packages are OK.
+ # missing or failed packages are OK.
# See https://bugzilla.redhat.com/show_bug.cgi?id=965567
(sudo_with_proxies "${YUM:-yum}" install -y "$@" 2>&1 || echo YUM_FAILED $?) \
- | awk "$parse_yum_result"
- result=$?
-
- if [ "$result" != 0 ]; then
- echo $LINENO "${YUM:-yum}" install failure: $result
- fi
+ | awk "$parse_yum_result" && result=$? || result=$?
time_stop "yum_install"
+ # if we return 1, then the wrapper functions will run an update
+ # and try installing the package again as a defense against bad
+ # mirrors. This can hide failures, especially when we have
+ # packages that are in the "Failed:" section because their rpm
+ # install scripts failed to run correctly (in this case, the
+ # package looks installed, so when the retry happens we just think
+ # the package is OK, and incorrectly continue on).
+ if [ "$result" == 2 ]; then
+ die "Detected fatal package install failure"
+ fi
+
return "$result"
}
@@ -1643,7 +1652,7 @@
done
if [ -n "$failures" ]; then
- die $LINENO "More details about the above errors can be found with screen, with ./rejoin-stack.sh"
+ die $LINENO "More details about the above errors can be found with screen"
fi
}
diff --git a/lib/heat b/lib/heat
index 4131878..2cf7a19 100644
--- a/lib/heat
+++ b/lib/heat
@@ -166,9 +166,6 @@
# clients_keystone
iniset $HEAT_CONF clients_keystone auth_uri $KEYSTONE_AUTH_URI
- # ec2authtoken
- iniset $HEAT_CONF ec2authtoken auth_uri $KEYSTONE_SERVICE_URI/v2.0
-
# OpenStack API
iniset $HEAT_CONF heat_api bind_port $HEAT_API_PORT
iniset $HEAT_CONF heat_api workers "$API_WORKERS"
diff --git a/lib/keystone b/lib/keystone
index 47de2b7..acdd7e4 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -281,9 +281,6 @@
iniset $KEYSTONE_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
if [ "$KEYSTONE_DEPLOY" == "mod_wsgi" ]; then
- iniset $KEYSTONE_CONF DEFAULT logging_context_format_string "%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s"
- iniset $KEYSTONE_CONF DEFAULT logging_default_format_string "%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s"
- iniset $KEYSTONE_CONF DEFAULT logging_debug_format_suffix "%(asctime)s.%(msecs)03d %(funcName)s %(pathname)s:%(lineno)d"
iniset $KEYSTONE_CONF DEFAULT logging_exception_prefix "%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s"
_config_keystone_apache_wsgi
elif [ "$KEYSTONE_DEPLOY" == "uwsgi" ]; then
@@ -303,28 +300,27 @@
fi
iniset "$KEYSTONE_PUBLIC_UWSGI_FILE" uwsgi wsgi-file "$KEYSTONE_BIN_DIR/keystone-wsgi-public"
- # This is running standalone
iniset "$KEYSTONE_PUBLIC_UWSGI_FILE" uwsgi threads $(nproc)
- iniset "$KEYSTONE_PUBLIC_UWSGI_FILE" uwsgi enable-threads true
- iniset "$KEYSTONE_PUBLIC_UWSGI_FILE" uwsgi plugins python
- # uwsgi recommends this to prevent thundering herd on accept.
- iniset "$KEYSTONE_PUBLIC_UWSGI_FILE" uwsgi thunder-lock true
- # Override the default size for headers from the 4k default.
- iniset "$KEYSTONE_PUBLIC_UWSGI_FILE" uwsgi buffer-size 65535
- # Make sure the client doesn't try to re-use the connection.
- iniset "$KEYSTONE_PUBLIC_UWSGI_FILE" uwsgi add-header "Connection: close"
iniset "$KEYSTONE_ADMIN_UWSGI_FILE" uwsgi wsgi-file "$KEYSTONE_BIN_DIR/keystone-wsgi-admin"
- # This is running standalone
iniset "$KEYSTONE_ADMIN_UWSGI_FILE" uwsgi threads $API_WORKERS
- iniset "$KEYSTONE_ADMIN_UWSGI_FILE" uwsgi enable-threads true
- iniset "$KEYSTONE_ADMIN_UWSGI_FILE" uwsgi plugins python
- # uwsgi recommends this to prevent thundering herd on accept.
- iniset "$KEYSTONE_ADMIN_UWSGI_FILE" uwsgi thunder-lock true
- # Override the default size for headers from the 4k default.
- iniset "$KEYSTONE_ADMIN_UWSGI_FILE" uwsgi buffer-size 65535
- # Make sure the client doesn't try to re-use the connection.
- iniset "$KEYSTONE_ADMIN_UWSGI_FILE" uwsgi add-header "Connection: close"
+
+ # Common settings
+ for file in "$KEYSTONE_PUBLIC_UWSGI_FILE" "$KEYSTONE_ADMIN_UWSGI_FILE"; do
+ # This is running standalone
+ iniset "$file" uwsgi master true
+ # Set die-on-term & exit-on-reload so that uwsgi shuts down
+ iniset "$file" uwsgi die-on-term true
+ iniset "$file" uwsgi exit-on-reload true
+ iniset "$file" uwsgi enable-threads true
+ iniset "$file" uwsgi plugins python
+ # uwsgi recommends this to prevent thundering herd on accept.
+ iniset "$file" uwsgi thunder-lock true
+ # Override the default size for headers from the 4k default.
+ iniset "$file" uwsgi buffer-size 65535
+ # Make sure the client doesn't try to re-use the connection.
+ iniset "$file" uwsgi add-header "Connection: close"
+ done
else # eventlet
if is_ssl_enabled_service key; then
@@ -523,7 +519,6 @@
if use_library_from_git "python-keystoneclient"; then
git_clone_by_name "python-keystoneclient"
setup_dev_lib "python-keystoneclient"
- sudo install -D -m 0644 -o $STACK_USER {${GITDIR["python-keystoneclient"]}/tools/,/etc/bash_completion.d/}keystone.bash_completion
fi
}
@@ -629,40 +624,16 @@
# - ``KEYSTONE_SERVICE_HOST``
# - ``KEYSTONE_SERVICE_PORT``
function bootstrap_keystone {
-
- # Initialize keystone, this will create an 'admin' user, 'admin' project,
- # 'admin' role, and assign the user the role on the project. These resources
- # are created only if they do not already exist.
- $KEYSTONE_BIN_DIR/keystone-manage bootstrap --bootstrap-password $ADMIN_PASSWORD
-
- # Create the keystone service and endpoints. To do this with the new
- # bootstrapping process, we need to get a token and use that token to
- # interact with the new APIs. The token will only be used to create services
- # and endpoints, thus creating a minimal service catalog.
- # They are unset immediately after.
- # TODO(stevemar): OpenStackClient and KeystoneClient do not have support to
- # handle interactions that not return service catalogs. Eventually remove
- # this section when the support is in place. Use token based auth for now.
- local token_id
- token_id=$(openstack token issue -c id -f value \
- --os-username admin --os-project-name admin \
- --os-user-domain-id default --os-project-domain-id default \
- --os-identity-api-version 3 --os-auth-url $KEYSTONE_AUTH_URI \
- --os-password $ADMIN_PASSWORD)
-
- export OS_TOKEN=$token_id
- export OS_URL=$KEYSTONE_AUTH_URI/v3
- export OS_IDENTITY_API_VERSION=3
-
- get_or_create_service "keystone" "identity" "Keystone Identity Service"
- get_or_create_endpoint \
- "identity" \
- "$REGION_NAME" \
- "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v$IDENTITY_API_VERSION" \
- "$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION" \
- "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v$IDENTITY_API_VERSION"
-
- unset OS_TOKEN OS_URL OS_IDENTITY_API_VERSION
+ $KEYSTONE_BIN_DIR/keystone-manage bootstrap \
+ --bootstrap-username admin \
+ --bootstrap-password "$ADMIN_PASSWORD" \
+ --bootstrap-project-name admin \
+ --bootstrap-role-name admin \
+ --bootstrap-service-name keystone \
+ --bootstrap-region-id "$REGION_NAME" \
+ --bootstrap-admin-url "$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION" \
+ --bootstrap-public-url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v$IDENTITY_API_VERSION" \
+ --bootstrap-internal-url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v$IDENTITY_API_VERSION"
}
# Restore xtrace
diff --git a/lib/neutron_plugins/openvswitch_agent b/lib/neutron_plugins/openvswitch_agent
index 94a2689..339d5fd 100644
--- a/lib/neutron_plugins/openvswitch_agent
+++ b/lib/neutron_plugins/openvswitch_agent
@@ -37,19 +37,12 @@
}
function neutron_plugin_configure_plugin_agent {
- local mappings_array mapping phys_bridge
# Setup integration bridge
_neutron_ovs_base_setup_bridge $OVS_BRIDGE
_neutron_ovs_base_configure_firewall_driver
# Setup agent for tunneling
if [[ "$OVS_ENABLE_TUNNELING" == "True" ]]; then
- # Verify tunnels are supported
- # REVISIT - also check kernel module support for GRE and patch ports
- OVS_VERSION=`ovs-vsctl --version | head -n 1 | grep -E -o "[0-9]+\.[0-9]+"`
- if [ `vercmp_numbers "$OVS_VERSION" "1.4"` -lt "0" ] && ! is_service_enabled q-svc ; then
- die $LINENO "You are running OVS version $OVS_VERSION. OVS 1.4+ is required for tunneling between multiple hosts."
- fi
iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $TUNNEL_ENDPOINT_IP
iniset /$Q_PLUGIN_CONF_FILE ovs tunnel_bridge $OVS_TUNNEL_BRIDGE
fi
@@ -59,15 +52,9 @@
# complex physical network configurations.
if [[ "$OVS_BRIDGE_MAPPINGS" == "" ]] && [[ "$PHYSICAL_NETWORK" != "" ]] && [[ "$OVS_PHYSICAL_BRIDGE" != "" ]]; then
OVS_BRIDGE_MAPPINGS=$PHYSICAL_NETWORK:$OVS_PHYSICAL_BRIDGE
- fi
- if [[ "$OVS_BRIDGE_MAPPINGS" != "" ]]; then
- IFS=',' read -a mappings_array <<< "$OVS_BRIDGE_MAPPINGS"
- for mapping in "${mappings_array[@]}"; do
- phys_bridge=`echo $mapping | cut -f 2 -d ":"`
- # Configure bridge manually with physical interface as port for multi-node
- _neutron_ovs_base_add_bridge $phys_bridge
- done
+ # Configure bridge manually with physical interface as port for multi-node
+ _neutron_ovs_base_add_bridge $OVS_PHYSICAL_BRIDGE
fi
if [[ "$OVS_BRIDGE_MAPPINGS" != "" ]]; then
iniset /$Q_PLUGIN_CONF_FILE ovs bridge_mappings $OVS_BRIDGE_MAPPINGS
diff --git a/lib/nova b/lib/nova
index fd458c5..3a5a47f 100644
--- a/lib/nova
+++ b/lib/nova
@@ -74,9 +74,6 @@
if is_ssl_enabled_service "nova" || is_service_enabled tls-proxy; then
NOVA_SERVICE_PROTOCOL="https"
- EC2_SERVICE_PROTOCOL="https"
-else
- EC2_SERVICE_PROTOCOL="http"
fi
# Public facing bits
@@ -86,8 +83,6 @@
NOVA_SERVICE_PROTOCOL=${NOVA_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
NOVA_SERVICE_LOCAL_HOST=${NOVA_SERVICE_LOCAL_HOST:-$SERVICE_LOCAL_HOST}
NOVA_SERVICE_LISTEN_ADDRESS=${NOVA_SERVICE_LISTEN_ADDRESS:-$SERVICE_LISTEN_ADDRESS}
-EC2_SERVICE_PORT=${EC2_SERVICE_PORT:-8773}
-EC2_SERVICE_PORT_INT=${EC2_SERVICE_PORT_INT:-18773}
METADATA_SERVICE_PORT=${METADATA_SERVICE_PORT:-8775}
# Option to enable/disable config drive
@@ -140,7 +135,6 @@
PUBLIC_INTERFACE=${PUBLIC_INTERFACE:-$PUBLIC_INTERFACE_DEFAULT}
VLAN_INTERFACE=${VLAN_INTERFACE:-$GUEST_INTERFACE_DEFAULT}
FLAT_NETWORK_BRIDGE=${FLAT_NETWORK_BRIDGE:-$FLAT_NETWORK_BRIDGE_DEFAULT}
-EC2_DMZ_HOST=${EC2_DMZ_HOST:-$SERVICE_HOST}
# If you are using the FlatDHCP network mode on multiple hosts, set the
# ``FLAT_INTERFACE`` variable but make sure that the interface doesn't already
@@ -594,7 +588,6 @@
iniset $NOVA_CONF spice enabled false
fi
- iniset $NOVA_CONF DEFAULT ec2_dmz_host "$EC2_DMZ_HOST"
iniset_rpc_backend nova $NOVA_CONF
iniset $NOVA_CONF glance api_servers "${GLANCE_SERVICE_PROTOCOL}://${GLANCE_HOSTPORT}"
@@ -810,7 +803,6 @@
# Start proxies if enabled
if is_service_enabled tls-proxy; then
start_tls_proxy '*' $NOVA_SERVICE_PORT $NOVA_SERVICE_HOST $NOVA_SERVICE_PORT_INT &
- start_tls_proxy '*' $EC2_SERVICE_PORT $NOVA_SERVICE_HOST $EC2_SERVICE_PORT_INT &
fi
export PATH=$old_path
diff --git a/lib/swift b/lib/swift
index b6c3ca4..8c5aa5e 100644
--- a/lib/swift
+++ b/lib/swift
@@ -71,17 +71,20 @@
# only 1G we can not upload volume to image.
# Increase Swift disk size up to 2G
SWIFT_LOOPBACK_DISK_SIZE_DEFAULT=2G
+ SWIFT_MAX_FILE_SIZE_DEFAULT=1073741824 # 1G
else
# DevStack will create a loop-back disk formatted as XFS to store the
# swift data. Set ``SWIFT_LOOPBACK_DISK_SIZE`` to the disk size in
# kilobytes.
# Default is 1 gigabyte.
SWIFT_LOOPBACK_DISK_SIZE_DEFAULT=1G
+ SWIFT_MAX_FILE_SIZE_DEFAULT=536870912 # 512M
fi
# if tempest enabled the default size is 6 Gigabyte.
if is_service_enabled tempest; then
SWIFT_LOOPBACK_DISK_SIZE_DEFAULT=${SWIFT_LOOPBACK_DISK_SIZE:-6G}
+ SWIFT_MAX_FILE_SIZE_DEFAULT=5368709122 # Swift default 5G
fi
SWIFT_LOOPBACK_DISK_SIZE=${SWIFT_LOOPBACK_DISK_SIZE:-$SWIFT_LOOPBACK_DISK_SIZE_DEFAULT}
@@ -127,6 +130,10 @@
# Swift API
SWIFT_MAX_HEADER_SIZE=${SWIFT_MAX_HEADER_SIZE:-16384}
+# Set ``SWIFT_MAX_FILE_SIZE`` to configure the maximum file size in Swift API
+# Default 500MB because the loopback file used for swift could be 1 or 2 GB
+SWIFT_MAX_FILE_SIZE=${SWIFT_MAX_FILE_SIZE:-$SWIFT_MAX_FILE_SIZE_DEFAULT}
+
# Set ``OBJECT_PORT_BASE``, ``CONTAINER_PORT_BASE``, ``ACCOUNT_PORT_BASE``
# Port bases used in port number calculation for the service "nodes"
# The specified port number will be used, the additional ports calculated by
@@ -462,6 +469,7 @@
cp ${SWIFT_DIR}/etc/swift.conf-sample ${SWIFT_CONF_DIR}/swift.conf
iniset ${SWIFT_CONF_DIR}/swift.conf swift-hash swift_hash_path_suffix ${SWIFT_HASH}
iniset ${SWIFT_CONF_DIR}/swift.conf swift-constraints max_header_size ${SWIFT_MAX_HEADER_SIZE}
+ iniset ${SWIFT_CONF_DIR}/swift.conf swift-constraints max_file_size ${SWIFT_MAX_FILE_SIZE}
local node_number
for node_number in ${SWIFT_REPLICAS_SEQ}; do
diff --git a/lib/tempest b/lib/tempest
index 3b8a888..19b63d1 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -176,7 +176,7 @@
sudo install -d -o $STACK_USER $TEMPEST_CONFIG_DIR
rm -f $TEMPEST_CONFIG
- local password=${ADMIN_PASSWORD:-secrete}
+ local password=${ADMIN_PASSWORD:-secret}
# See ``lib/keystone`` where these users and tenants are set up
local admin_username=${ADMIN_USERNAME:-admin}
diff --git a/openrc b/openrc
index 460cf14..db2e97d 100644
--- a/openrc
+++ b/openrc
@@ -51,7 +51,7 @@
# With Keystone you pass the keystone password instead of an api key.
# Recent versions of novaclient use OS_PASSWORD instead of NOVA_API_KEYs
# or NOVA_PASSWORD.
-export OS_PASSWORD=${ADMIN_PASSWORD:-secrete}
+export OS_PASSWORD=${ADMIN_PASSWORD:-secret}
# Don't put the key into a keyring by default. Testing for development is much
# easier with this off.
diff --git a/rejoin-stack.sh b/rejoin-stack.sh
deleted file mode 100755
index 7048865..0000000
--- a/rejoin-stack.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /usr/bin/env bash
-
-# This script rejoins an existing screen, or re-creates a
-# screen session from a previous run of stack.sh.
-
-TOP_DIR=`dirname $0`
-
-# Import common functions in case the localrc (loaded via stackrc)
-# uses them.
-source $TOP_DIR/functions
-
-source $TOP_DIR/stackrc
-
-SCREENRC=$TOP_DIR/$SCREEN_NAME-screenrc
-# if screenrc exists, run screen
-if [[ -e $SCREENRC ]]; then
- if screen -ls | egrep -q "[0-9]+.${SCREEN_NAME}"; then
- echo "Attaching to already started screen session.."
- exec screen -r $SCREEN_NAME
- fi
- exec screen -c $SCREENRC
-fi
-
-echo "Couldn't find $SCREENRC file; have you run stack.sh yet?"
-exit 1
diff --git a/samples/local.conf b/samples/local.conf
index ea68dc0..06ac185 100644
--- a/samples/local.conf
+++ b/samples/local.conf
@@ -25,7 +25,7 @@
# If the ``*_PASSWORD`` variables are not set here you will be prompted to enter
# values for them by ``stack.sh``and they will be added to ``local.conf``.
-ADMIN_PASSWORD=nomoresecrete
+ADMIN_PASSWORD=nomoresecret
DATABASE_PASSWORD=stackdb
RABBIT_PASSWORD=stackqueue
SERVICE_PASSWORD=$ADMIN_PASSWORD
diff --git a/stack.sh b/stack.sh
index 0be3585..5c16f04 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1208,14 +1208,6 @@
done
fi
-# Create an access key and secret key for Nova EC2 register image
-if is_service_enabled keystone && is_service_enabled swift3 && is_service_enabled nova; then
- eval $(openstack ec2 credentials create --user nova --project $SERVICE_PROJECT_NAME -f shell -c access -c secret)
- iniset $NOVA_CONF DEFAULT s3_access_key "$access"
- iniset $NOVA_CONF DEFAULT s3_secret_key "$secret"
- iniset $NOVA_CONF DEFAULT s3_affix_tenant "True"
-fi
-
# Create a randomized default value for the keymgr's fixed_key
if is_service_enabled nova; then
iniset $NOVA_CONF keymgr fixed_key $(generate_hex_string 32)
diff --git a/stackrc b/stackrc
index 7294f7b..74d507c 100644
--- a/stackrc
+++ b/stackrc
@@ -67,7 +67,7 @@
# Keystone - nothing works without keystone
ENABLED_SERVICES=key
# Nova - services to support libvirt based openstack clouds
- ENABLED_SERVICES+=,n-api,n-cpu,n-net,n-cond,n-sch,n-novnc,n-crt,n-cauth
+ ENABLED_SERVICES+=,n-api,n-cpu,n-net,n-cond,n-sch,n-novnc,n-cauth
# Glance services needed for Nova
ENABLED_SERVICES+=,g-api,g-reg
# Cinder
@@ -625,7 +625,7 @@
IMAGE_URLS+=",http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-uec.tar.gz";;
ironic)
# Ironic can do both partition and full disk images, depending on the driver
- if [[ "$IRONIC_DEPLOY_DRIVER" == "agent_ssh" ]]; then
+ if [[ -z "${IRONIC_DEPLOY_DRIVER%%agent*}" ]]; then
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-x86_64-disk}
else
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-x86_64-uec}
@@ -639,11 +639,17 @@
DOWNLOAD_DEFAULT_IMAGES=False
fi
-# Staging Area for New Images, have them here for at least 24hrs for nodepool
-# to cache them otherwise the failure rates in the gate are too high
+# Staging area for new images. These images are cached by a run of
+# ./tools/image_list.sh during CI image build (see
+# project-config:nodepool/elements/cache-devstack/extra-data.d/55-cache-devstack-repos).
+#
+# To avoid CI failures grabbing the images, new images should be here
+# for at least 24hrs (nodepool builds images at 14:00UTC) so the they
+# are in the cache.
PRECACHE_IMAGES=$(trueorfalse False PRECACHE_IMAGES)
if [[ "$PRECACHE_IMAGES" == "True" ]]; then
-
+ # required for trove devstack tests; see
+ # git.openstack.org/cgit/openstack/trove/tree/devstack/plugin.sh
IMAGE_URL="http://tarballs.openstack.org/trove/images/ubuntu/mysql.qcow2"
if ! [[ "$IMAGE_URLS" =~ "$IMAGE_URL" ]]; then
IMAGE_URLS+=",$IMAGE_URL"
diff --git a/tests/test_package_ordering.sh b/tests/test_package_ordering.sh
index a568abf..bfc2a19 100755
--- a/tests/test_package_ordering.sh
+++ b/tests/test_package_ordering.sh
@@ -7,6 +7,7 @@
source $TOP/tests/unittest.sh
+export LC_ALL=en_US.UTF-8
PKG_FILES=$(find $TOP/files/debs $TOP/files/rpms $TOP/files/rpms-suse -type f)
TMPDIR=$(mktemp -d)
diff --git a/tools/create_userrc.sh b/tools/create_userrc.sh
index 74d5428..3325c5e 100755
--- a/tools/create_userrc.sh
+++ b/tools/create_userrc.sh
@@ -156,30 +156,6 @@
exit 3
fi
-EC2_URL=$(openstack endpoint list --service ec2 --interface public --os-identity-api-version=3 -c URL -f value || true)
-if [[ -z $EC2_URL ]]; then
- EC2_URL=http://localhost:8773/
-fi
-
-S3_URL=$(openstack endpoint list --service s3 --interface public --os-identity-api-version=3 -c URL -f value || true)
-if [[ -z $S3_URL ]]; then
- S3_URL=http://localhost:3333
-fi
-
-mkdir -p "$ACCOUNT_DIR"
-ACCOUNT_DIR=`readlink -f "$ACCOUNT_DIR"`
-EUCALYPTUS_CERT=$ACCOUNT_DIR/cacert.pem
-if [ -e "$EUCALYPTUS_CERT" ]; then
- mv "$EUCALYPTUS_CERT" "$EUCALYPTUS_CERT.old"
-fi
-if ! nova x509-get-root-cert "$EUCALYPTUS_CERT"; then
- echo "Failed to update the root certificate: $EUCALYPTUS_CERT" >&2
- if [ -e "$EUCALYPTUS_CERT.old" ]; then
- mv "$EUCALYPTUS_CERT.old" "$EUCALYPTUS_CERT"
- fi
-fi
-
-
function add_entry {
local user_id=$1
local user_name=$2
@@ -187,54 +163,16 @@
local project_name=$4
local user_passwd=$5
- # The admin user can see all user's secret AWS keys, it does not looks good
- local line
- line=$(openstack ec2 credentials list --user $user_id | grep " $project_id " || true)
- if [ -z "$line" ]; then
- openstack ec2 credentials create --user $user_id --project $project_id 1>&2
- line=`openstack ec2 credentials list --user $user_id | grep " $project_id "`
- fi
- local ec2_access_key ec2_secret_key
- read ec2_access_key ec2_secret_key <<< `echo $line | awk '{print $2 " " $4 }'`
mkdir -p "$ACCOUNT_DIR/$project_name"
local rcfile="$ACCOUNT_DIR/$project_name/$user_name"
- # The certs subject part are the project ID "dash" user ID, but the CN should be the first part of the DN
- # Generally the subject DN parts should be in reverse order like the Issuer
- # The Serial does not seams correctly marked either
- local ec2_cert="$rcfile-cert.pem"
- local ec2_private_key="$rcfile-pk.pem"
- # Try to preserve the original file on fail (best effort)
- if [ -e "$ec2_private_key" ]; then
- mv -f "$ec2_private_key" "$ec2_private_key.old"
- fi
- if [ -e "$ec2_cert" ]; then
- mv -f "$ec2_cert" "$ec2_cert.old"
- fi
- # It will not create certs when the password is incorrect
- if ! nova --os-password "$user_passwd" --os-username "$user_name" --os-project-name "$project_name" x509-create-cert "$ec2_private_key" "$ec2_cert"; then
- if [ -e "$ec2_private_key.old" ]; then
- mv -f "$ec2_private_key.old" "$ec2_private_key"
- fi
- if [ -e "$ec2_cert.old" ]; then
- mv -f "$ec2_cert.old" "$ec2_cert"
- fi
- fi
+
cat >"$rcfile" <<EOF
-# you can source this file
-export EC2_ACCESS_KEY="$ec2_access_key"
-export EC2_SECRET_KEY="$ec2_secret_key"
-export EC2_URL="$EC2_URL"
-export S3_URL="$S3_URL"
# OpenStack USER ID = $user_id
export OS_USERNAME="$user_name"
# OpenStack project ID = $project_id
export OS_PROJECT_NAME="$project_name"
export OS_AUTH_URL="$OS_AUTH_URL"
export OS_CACERT="$OS_CACERT"
-export EC2_CERT="$ec2_cert"
-export EC2_PRIVATE_KEY="$ec2_private_key"
-export EC2_USER_ID=42 #not checked by nova (can be a 12-digit id)
-export EUCALYPTUS_CERT="$ACCOUNT_DIR/cacert.pem"
export NOVA_CERT="$ACCOUNT_DIR/cacert.pem"
export OS_AUTH_TYPE=v2password
EOF
diff --git a/tools/generate-devstack-plugins-list.sh b/tools/generate-devstack-plugins-list.sh
index 8a1f743..be3f60a 100644
--- a/tools/generate-devstack-plugins-list.sh
+++ b/tools/generate-devstack-plugins-list.sh
@@ -41,7 +41,9 @@
(
declare -A plugins
-test -r data/devstack-plugins-registry.header && cat data/devstack-plugins-registry.header
+if [[ -r data/devstack-plugins-registry.header ]]; then
+ cat data/devstack-plugins-registry.header
+fi
sorted_plugins=$(python tools/generate-devstack-plugins-list.py)
@@ -52,7 +54,9 @@
printf "+----------------------------+-------------------------------------------------------------------------+\n"
done
-test -r data/devstack-plugins-registry.footer && cat data/devstack-plugins-registry.footer
+if [[ -r data/devstack-plugins-registry.footer ]]; then
+ cat data/devstack-plugins-registry.footer
+fi
) > doc/source/plugin-registry.rst
if [[ -n ${1} ]]; then
diff --git a/tools/xen/xenrc b/tools/xen/xenrc
index be6c5ca..bb27454 100644
--- a/tools/xen/xenrc
+++ b/tools/xen/xenrc
@@ -32,7 +32,7 @@
XEN_INT_BRIDGE_OR_NET_NAME="OpenStack VM Integration Network"
# VM Password
-GUEST_PASSWORD=${GUEST_PASSWORD:-secrete}
+GUEST_PASSWORD=${GUEST_PASSWORD:-secret}
# Extracted variables for OpenStack VM network device numbers.
# Make sure they form a continuous sequence starting from 0
diff --git a/tox.ini b/tox.ini
index ef557fb..3dfc377 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@
# against devstack, just set BASHATE_INSTALL_PATH=/path/... to your
# modified bashate tree
deps =
- {env:BASHATE_INSTALL_PATH:bashate==0.4.0}
+ {env:BASHATE_INSTALL_PATH:bashate==0.5.0}
whitelist_externals = bash
commands = bash -c "find {toxinidir} \
-not \( -type d -name .?\* -prune \) \
@@ -22,9 +22,10 @@
-not -name \*~ \
-not -name \*.md \
-not -name stack-screenrc \
+ -not -name \*.orig \
+ -not -name \*.rej \
\( \
-name \*.sh -or \
- -name \*.orig -or \
-name \*rc -or \
-name functions\* -or \
-wholename \*/inc/\* -or \