Merge "use "rabbit_hosts" config option instead of "rabbit_host""
diff --git a/clean.sh b/clean.sh
index e121e4f..3707d84 100755
--- a/clean.sh
+++ b/clean.sh
@@ -123,6 +123,6 @@
FILES_TO_CLEAN=".localrc.auto docs-files docs/ shocco/ stack-screenrc test*.conf* test.ini*"
FILES_TO_CLEAN+=".stackenv .prereqs"
-for file in FILES_TO_CLEAN; do
+for file in $FILES_TO_CLEAN; do
rm -f $TOP_DIR/$file
done
diff --git a/exercises/boot_from_volume.sh b/exercises/boot_from_volume.sh
index 7912046..f679669 100755
--- a/exercises/boot_from_volume.sh
+++ b/exercises/boot_from_volume.sh
@@ -32,6 +32,7 @@
# Import project functions
source $TOP_DIR/lib/cinder
+source $TOP_DIR/lib/neutron
# Import configuration
source $TOP_DIR/openrc
diff --git a/functions b/functions
index 43639c7..a844b1c 100644
--- a/functions
+++ b/functions
@@ -6,10 +6,6 @@
# - ``ENABLED_SERVICES``
# - ``FILES``
# - ``GLANCE_HOSTPORT``
-# - ``REQUIREMENTS_DIR``
-# - ``STACK_USER``
-# - ``TRACK_DEPENDS``
-# - ``UNDO_REQUIREMENTS``
#
# Include the common functions
diff --git a/functions-common b/functions-common
index 228cb2a..0db3ff3 100644
--- a/functions-common
+++ b/functions-common
@@ -26,7 +26,10 @@
# - ``PIP_DOWNLOAD_CACHE``
# - ``PIP_USE_MIRRORS``
# - ``RECLONE``
+# - ``REQUIREMENTS_DIR``
+# - ``STACK_USER``
# - ``TRACK_DEPENDS``
+# - ``UNDO_REQUIREMENTS``
# - ``http_proxy``, ``https_proxy``, ``no_proxy``
# Save trace setting
diff --git a/lib/ceilometer b/lib/ceilometer
index d20d628..2e6e7c5 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -180,9 +180,11 @@
sudo chown $STACK_USER $CEILOMETER_AUTH_CACHE_DIR
rm -f $CEILOMETER_AUTH_CACHE_DIR/*
- if [ "$CEILOMETER_BACKEND" = 'mysql' ] || [ "$CEILOMETER_BACKEND" = 'postgresql' ] ; then
- recreate_database ceilometer utf8
- $CEILOMETER_BIN_DIR/ceilometer-dbsync
+ if is_service_enabled mysql postgresql; then
+ if [ "$CEILOMETER_BACKEND" = 'mysql' ] || [ "$CEILOMETER_BACKEND" = 'postgresql' ] ; then
+ recreate_database ceilometer utf8
+ $CEILOMETER_BIN_DIR/ceilometer-dbsync
+ fi
fi
}
@@ -206,9 +208,12 @@
screen_it ceilometer-collector "cd ; ceilometer-collector --config-file $CEILOMETER_CONF"
screen_it ceilometer-api "cd ; ceilometer-api -d -v --log-dir=$CEILOMETER_API_LOG_DIR --config-file $CEILOMETER_CONF"
- echo "Waiting for ceilometer-api to start..."
- if ! timeout $SERVICE_TIMEOUT sh -c "while ! curl --noproxy '*' -s http://localhost:8777/v2/ >/dev/null; do sleep 1; done"; then
- die $LINENO "ceilometer-api did not start"
+ # only die on API if it was actually intended to be turned on
+ if service_enabled ceilometer-api; then
+ echo "Waiting for ceilometer-api to start..."
+ if ! timeout $SERVICE_TIMEOUT sh -c "while ! curl --noproxy '*' -s http://localhost:8777/v2/ >/dev/null; do sleep 1; done"; then
+ die $LINENO "ceilometer-api did not start"
+ fi
fi
screen_it ceilometer-alarm-notifier "cd ; ceilometer-alarm-notifier --config-file $CEILOMETER_CONF"
diff --git a/lib/marconi b/lib/marconi
index 8cfc55c..29ae386 100644
--- a/lib/marconi
+++ b/lib/marconi
@@ -95,6 +95,7 @@
sudo chown $USER $MARCONI_API_LOG_DIR
iniset $MARCONI_CONF DEFAULT verbose True
+ iniset $MARCONI_CONF DEFAULT use_syslog $SYSLOG
iniset $MARCONI_CONF 'drivers:transport:wsgi' bind $MARCONI_SERVICE_HOST
iniset $MARCONI_CONF keystone_authtoken auth_protocol http
diff --git a/lib/neutron_plugins/vmware_nsx b/lib/neutron_plugins/vmware_nsx
index 0930422..fe79354 100644
--- a/lib/neutron_plugins/vmware_nsx
+++ b/lib/neutron_plugins/vmware_nsx
@@ -41,8 +41,7 @@
Q_PLUGIN_CONF_PATH=etc/neutron/plugins/vmware
Q_PLUGIN_CONF_FILENAME=nsx.ini
Q_DB_NAME="neutron_nsx"
- # TODO(armando-migliaccio): rename this once the code rename is complete
- Q_PLUGIN_CLASS="neutron.plugins.nicira.NeutronPlugin.NvpPluginV2"
+ Q_PLUGIN_CLASS="neutron.plugins.vmware.plugin.NsxPlugin"
}
function neutron_plugin_configure_debug_command {
diff --git a/lib/nova b/lib/nova
index 90b1ba4..583a592 100644
--- a/lib/nova
+++ b/lib/nova
@@ -245,10 +245,9 @@
inicomment $NOVA_API_PASTE_INI filter:authtoken cafile
inicomment $NOVA_API_PASTE_INI filter:authtoken admin_user
inicomment $NOVA_API_PASTE_INI filter:authtoken admin_password
+ inicomment $NOVA_API_PASTE_INI filter:authtoken signing_dir
fi
- inicomment $NOVA_API_PASTE_INI filter:authtoken signing_dir
-
if is_service_enabled n-cpu; then
# Force IP forwarding on, just on case
sudo sysctl -w net.ipv4.ip_forward=1
diff --git a/lib/nova_plugins/hypervisor-docker b/lib/nova_plugins/hypervisor-docker
index f8dc6af..cdbc4d1 100644
--- a/lib/nova_plugins/hypervisor-docker
+++ b/lib/nova_plugins/hypervisor-docker
@@ -104,8 +104,7 @@
fi
# Make sure we copied the image in Glance
- DOCKER_IMAGE=$(glance image-list | egrep " $DOCKER_IMAGE_NAME ")
- if ! is_set DOCKER_IMAGE ; then
+ if ! (glance image-show "$DOCKER_IMAGE"); then
docker push $DOCKER_REPOSITORY_NAME
fi
}
diff --git a/lib/swift b/lib/swift
index 59c1e54..5d4d4ef 100644
--- a/lib/swift
+++ b/lib/swift
@@ -301,7 +301,7 @@
# rsyncd.conf just prepared for 4 nodes
if is_ubuntu; then
sudo sed -i '/^RSYNC_ENABLE=false/ { s/false/true/ }' /etc/default/rsync
- else
+ elif [ -e /etc/xinetd.d/rsync ]; then
sudo sed -i '/disable *= *yes/ { s/yes/no/ }' /etc/xinetd.d/rsync
fi
@@ -635,8 +635,10 @@
# Start rsync
if is_ubuntu; then
sudo /etc/init.d/rsync restart || :
+ elif [ -e /etc/xinetd.d/rsync ]; then
+ start_service xinetd
else
- sudo systemctl start xinetd.service
+ start_service rsyncd
fi
if is_apache_enabled_service swift; then