Merge "Fix role creation in tools/create_userrc.sh"
diff --git a/exercise.sh b/exercise.sh
index a0349ce..5b3c56e 100755
--- a/exercise.sh
+++ b/exercise.sh
@@ -28,7 +28,7 @@
# Loop over each possible script (by basename)
for script in $basenames; do
- if [[ "$SKIP_EXERCISES" =~ $script ]] ; then
+ if [[ ,$SKIP_EXERCISES, =~ ,$script, ]] ; then
skips="$skips $script"
else
echo "====================================================================="
diff --git a/exercises/volumes.sh b/exercises/volumes.sh
index 48a976e..5c5e0e4 100755
--- a/exercises/volumes.sh
+++ b/exercises/volumes.sh
@@ -192,7 +192,7 @@
# Delete volume
start_time=`date +%s`
cinder delete $VOL_ID || die "Failure deleting volume $VOL_NAME"
-if ! timeout $ACTIVE_TIMEOUT sh -c "while ! cinder list | grep $VOL_NAME; do sleep 1; done"; then
+if ! timeout $ACTIVE_TIMEOUT sh -c "while cinder list | grep $VOL_NAME; do sleep 1; done"; then
echo "Volume $VOL_NAME not deleted"
exit 1
fi
diff --git a/files/apts/general b/files/apts/general
index 12a92e0..0264066 100644
--- a/files/apts/general
+++ b/files/apts/general
@@ -6,7 +6,7 @@
unzip
wget
psmisc
-git-core
+git
lsof # useful when debugging
openssh-server
vim-nox
diff --git a/lib/cinder b/lib/cinder
index 8949cfc..4aaea5d 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -184,6 +184,7 @@
if [[ "$CINDER_SECURE_DELETE" == "False" ]]; then
iniset $CINDER_CONF DEFAULT secure_delete False
+ iniset $CINDER_CONF DEFAULT volume_clear none
fi
if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then
diff --git a/lib/nova b/lib/nova
index 4fef552..a43c091 100644
--- a/lib/nova
+++ b/lib/nova
@@ -414,12 +414,12 @@
add_nova_opt "logging_exception_prefix=%(color)s%(asctime)s.%(msecs)d TRACE %(name)s [01;35m%(instance)s[00m"
else
# Show user_name and project_name instead of user_id and project_id
- add_nova_opt "logging_context_format_string=%(asctime)s.%(msecs) %(levelname)s %(name)s [%(request_id)s %(user_name)s %(project_name)s] %(instance)s%(message)s"
+ add_nova_opt "logging_context_format_string=%(asctime)s.%(msecs)d %(levelname)s %(name)s [%(request_id)s %(user_name)s %(project_name)s] %(instance)s%(message)s"
fi
if is_service_enabled ceilometer; then
add_nova_opt "instance_usage_audit=True"
add_nova_opt "instance_usage_audit_period=hour"
- add_nova_opt "notification_driver=nova.openstack.common.notifier.rabbit_notifier"
+ add_nova_opt "notification_driver=nova.openstack.common.notifier.rpc_notifier"
add_nova_opt "notification_driver=ceilometer.compute.nova_notifier"
fi
diff --git a/lib/swift b/lib/swift
index 8934264..c433387 100644
--- a/lib/swift
+++ b/lib/swift
@@ -99,7 +99,7 @@
# changing the permissions so we can run it as our user.
USER_GROUP=$(id -g)
- sudo mkdir -p ${SWIFT_DATA_DIR}/drives
+ sudo mkdir -p ${SWIFT_DATA_DIR}/{drives,cache}
sudo chown -R $USER:${USER_GROUP} ${SWIFT_DATA_DIR}
# Create a loopback disk and format it to XFS.
@@ -273,16 +273,22 @@
swift_node_config=${SWIFT_CONFIG_DIR}/object-server/${node_number}.conf
cp ${SWIFT_DIR}/etc/object-server.conf-sample ${swift_node_config}
generate_swift_config ${swift_node_config} ${node_number} $[OBJECT_PORT_BASE + 10 * (node_number - 1)]
+ iniset ${swift_node_config} filter:recon recon_cache_path ${SWIFT_DATA_DIR}/cache
+ # Using a sed and not iniset/iniuncomment because we want to a global
+ # modification and make sure it works for new sections.
+ sed -i -e "s,#[ ]*recon_cache_path .*,recon_cache_path = ${SWIFT_DATA_DIR}/cache," ${swift_node_config}
swift_node_config=${SWIFT_CONFIG_DIR}/container-server/${node_number}.conf
cp ${SWIFT_DIR}/etc/container-server.conf-sample ${swift_node_config}
generate_swift_config ${swift_node_config} ${node_number} $[CONTAINER_PORT_BASE + 10 * (node_number - 1)]
iniuncomment ${swift_node_config} app:container-server allow_versions
iniset ${swift_node_config} app:container-server allow_versions "true"
+ sed -i -e "s,#[ ]*recon_cache_path .*,recon_cache_path = ${SWIFT_DATA_DIR}/cache," ${swift_node_config}
swift_node_config=${SWIFT_CONFIG_DIR}/account-server/${node_number}.conf
cp ${SWIFT_DIR}/etc/account-server.conf-sample ${swift_node_config}
generate_swift_config ${swift_node_config} ${node_number} $[ACCOUNT_PORT_BASE + 10 * (node_number - 1)]
+ sed -i -e "s,#[ ]*recon_cache_path .*,recon_cache_path = ${SWIFT_DATA_DIR}/cache," ${swift_node_config}
done
swift_log_dir=${SWIFT_DATA_DIR}/logs