Merge "Disable tempest tox venv recreation in OFFLINE mode"
diff --git a/lib/cinder_backends/solidfire b/lib/cinder_backends/solidfire
deleted file mode 100644
index 16bc527..0000000
--- a/lib/cinder_backends/solidfire
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-#
-# lib/cinder_backends/solidfire
-# Configure the solidfire driver
-
-# Enable with:
-#
-# CINDER_ENABLED_BACKENDS+=,solidfire:<volume-type-name>
-
-# Dependencies:
-#
-# - ``functions`` file
-# - ``cinder`` configurations
-
-# CINDER_CONF
-
-# configure_cinder_driver - make configuration changes, including those to other services
-
-# Save trace setting
-_XTRACE_CINDER_SOLIDFIRE=$(set +o | grep xtrace)
-set +o xtrace
-
-
-# Entry Points
-# ------------
-
-# configure_cinder_backend_solidfire - Set config files, create data dirs, etc
-function configure_cinder_backend_solidfire {
- # To use SolidFire, set the following in local.conf:
- # CINDER_ENABLED_BACKENDS+=,solidfire:<volume-type-name>
- # SAN_IP=<mvip>
- # SAN_LOGIN=<cluster-admin-account>
- # SAN_PASSWORD=<cluster-admin-password>
-
- local be_name=$1
- iniset $CINDER_CONF $be_name volume_backend_name $be_name
- iniset $CINDER_CONF $be_name volume_driver "cinder.volume.drivers.solidfire.SolidFireDriver"
- iniset $CINDER_CONF $be_name san_ip $SAN_IP
- iniset $CINDER_CONF $be_name san_login $SAN_LOGIN
- iniset $CINDER_CONF $be_name san_password $SAN_PASSWORD
-}
-
-
-# Restore xtrace
-$_XTRACE_CINDER_SOLIDFIRE
-
-# Local variables:
-# mode: shell-script
-# End:
diff --git a/tools/generate-devstack-plugins-list.sh b/tools/generate-devstack-plugins-list.sh
index 0176785..b7817a0 100644
--- a/tools/generate-devstack-plugins-list.sh
+++ b/tools/generate-devstack-plugins-list.sh
@@ -43,38 +43,18 @@
test -r data/devstack-plugins-registry.header && cat data/devstack-plugins-registry.header
-if test -n "$git_dir"; then
- pushd ${git_dir} >/dev/null
- for i in *; do
- pushd ${i} >/dev/null
- if output="$(git log --diff-filter=A --format='%cd' --date=short -1 -- devstack/plugin.sh)"; then
- test -n "$output" && plugins[$i]=${output}
- fi
- popd >/dev/null
- done
- popd >/dev/null
+sorted_plugins=$(python tools/generate-devstack-plugins-list.py)
- sorted_plugins=( $(for k in "${!plugins[@]}"; do echo "$k"; done | sort))
-
- for k in "${sorted_plugins[@]}"; do
- project=${k:0:18}
- giturl="git://git.openstack.org/openstack/${k:0:26}"
- pdate="${plugins[$k]}"
- printf "|%-18s|%-60s (%-10s)|\n" "${project}" "${giturl}" "${pdate}"
- printf "+------------------+-------------------------------------------------------------------------+\n"
- done
-
-else
- sorted_plugins=$(python tools/generate-devstack-plugins-list.py)
-
- for k in ${sorted_plugins}; do
- project=${k:0:18}
- giturl="git://git.openstack.org/openstack/${k:0:26}"
- printf "|%-18s|%-73s|\n" "${project}" "${giturl}"
- printf "+------------------+-------------------------------------------------------------------------+\n"
- done
-
-fi
+for k in ${sorted_plugins}; do
+ project=${k:0:18}
+ giturl="git://git.openstack.org/openstack/${k:0:26}"
+ printf "|%-18s|%-73s|\n" "${project}" "${giturl}"
+ printf "+------------------+-------------------------------------------------------------------------+\n"
+done
test -r data/devstack-plugins-registry.footer && cat data/devstack-plugins-registry.footer
) > doc/source/plugin-registry.rst
+
+if [[ -n ${1} ]]; then
+ cp doc/source/plugin-registry.rst ${1}/doc/source/plugin-registry.rst
+fi