Merge "All neutron plugins should now use LibvirtGenericVIFDriver"
diff --git a/lib/ironic b/lib/ironic
index 649c1c2..0c99717 100644
--- a/lib/ironic
+++ b/lib/ironic
@@ -93,6 +93,8 @@
# configure_ironic_api() - Is used by configure_ironic(). Performs
# API specific configuration.
function configure_ironic_api() {
+ iniset $IRONIC_CONF_FILE DEFAULT auth_strategy keystone
+ iniset $IRONIC_CONF_FILE DEFAULT policy_file $IRONIC_POLICY_JSON
iniset $IRONIC_CONF_FILE keystone_authtoken auth_host $KEYSTONE_AUTH_HOST
iniset $IRONIC_CONF_FILE keystone_authtoken auth_port $KEYSTONE_AUTH_PORT
iniset $IRONIC_CONF_FILE keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL
diff --git a/lib/nova_plugins/hypervisor-docker b/lib/nova_plugins/hypervisor-docker
index 427554b..2451982 100644
--- a/lib/nova_plugins/hypervisor-docker
+++ b/lib/nova_plugins/hypervisor-docker
@@ -24,7 +24,6 @@
# Set up default directories
DOCKER_DIR=$DEST/docker
-DOCKER_REPO=${DOCKER_REPO:-https://github.com/dotcloud/openstack-docker.git}
DOCKER_BRANCH=${DOCKER_BRANCH:-master}
DOCKER_UNIX_SOCKET=/var/run/docker.sock
@@ -54,10 +53,6 @@
# configure_nova_hypervisor - Set config files, create data dirs, etc
function configure_nova_hypervisor() {
- git_clone $DOCKER_REPO $DOCKER_DIR $DOCKER_BRANCH
-
- ln -snf ${DOCKER_DIR}/nova-driver $NOVA_DIR/nova/virt/docker
-
iniset $NOVA_CONF DEFAULT compute_driver docker.DockerDriver
iniset $GLANCE_API_CONF DEFAULT container_formats ami,ari,aki,bare,ovf,docker
diff --git a/lib/stackforge b/lib/stackforge
new file mode 100644
index 0000000..4b79de0
--- /dev/null
+++ b/lib/stackforge
@@ -0,0 +1,67 @@
+# lib/stackforge
+#
+# Functions to install stackforge libraries that we depend on so
+# that we can try their git versions during devstack gate.
+#
+# This is appropriate for python libraries that release to pypi and are
+# expected to be used beyond OpenStack like, but are requirements
+# for core services in global-requirements.
+# * wsme
+# * pecan
+#
+# This is not appropriate for stackforge projects which are early stage
+# OpenStack tools
+
+# Dependencies:
+# ``functions`` file
+
+# ``stack.sh`` calls the entry points in this order:
+#
+# install_stackforge
+
+# Save trace setting
+XTRACE=$(set +o | grep xtrace)
+set +o xtrace
+
+
+# Defaults
+# --------
+WSME_DIR=$DEST/wsme
+PECAN_DIR=$DEST/pecan
+
+# Entry Points
+# ------------
+
+# install_stackforge() - Collect source and prepare
+function install_stackforge() {
+ # TODO(sdague): remove this once we get to Icehouse, this just makes
+ # for a smoother transition of existing users.
+ cleanup_stackforge
+
+ git_clone $WSME_REPO $WSME_DIR $WSME_BRANCH
+ setup_develop $WSME_DIR
+
+ git_clone $PECAN_REPO $PECAN_DIR $PECAN_BRANCH
+ setup_develop $PECAN_DIR
+}
+
+# cleanup_stackforge() - purge possibly old versions of stackforge libraries
+function cleanup_stackforge() {
+ # this means we've got an old version installed, lets get rid of it
+ # otherwise python hates itself
+ for lib in wsme pecan; do
+ if ! python -c "import $lib" 2>/dev/null; then
+ echo "Found old $lib... removing to ensure consistency"
+ local PIP_CMD=$(get_pip_command)
+ pip_install $lib
+ sudo $PIP_CMD uninstall -y $lib
+ fi
+ done
+}
+
+# Restore xtrace
+$XTRACE
+
+# Local variables:
+# mode: shell-script
+# End:
diff --git a/lib/tempest b/lib/tempest
index 8e4e521..b3df139 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -296,7 +296,7 @@
iniset $TEMPEST_CONF cli cli_dir $NOVA_BIN_DIR
# service_available
- for service in nova cinder glance neutron swift heat horizon ; do
+ for service in nova cinder glance neutron swift heat horizon ceilometer; do
if is_service_enabled $service ; then
iniset $TEMPEST_CONF service_available $service "True"
else
diff --git a/stack.sh b/stack.sh
index 5813a8a..6de7599 100755
--- a/stack.sh
+++ b/stack.sh
@@ -299,6 +299,7 @@
source $TOP_DIR/lib/tls
source $TOP_DIR/lib/infra
source $TOP_DIR/lib/oslo
+source $TOP_DIR/lib/stackforge
source $TOP_DIR/lib/horizon
source $TOP_DIR/lib/keystone
source $TOP_DIR/lib/glance
@@ -629,6 +630,11 @@
# Install oslo libraries that have graduated
install_oslo
+# Install stackforge libraries for testing
+if is_service_enabled stackforge_libs; then
+ install_stackforge
+fi
+
# Install clients libraries
install_keystoneclient
install_glanceclient
diff --git a/stackrc b/stackrc
index 7069327..4fd4691 100644
--- a/stackrc
+++ b/stackrc
@@ -197,6 +197,16 @@
TROVECLIENT_REPO=${TROVECLIENT_REPO:-${GIT_BASE}/openstack/python-troveclient.git}
TROVECLIENT_BRANCH=${TROVECLIENT_BRANCH:-master}
+# stackforge libraries that are used by OpenStack core services
+# wsme
+WSME_REPO=${WSME_REPO:-${GIT_BASE}/stackforge/wsme.git}
+WSME_BRANCH=${WSME_BRANCH:-master}
+
+# pecan
+PECAN_REPO=${PECAN_REPO:-${GIT_BASE}/stackforge/pecan.git}
+PECAN_BRANCH=${PECAN_BRANCH:-master}
+
+
# Nova hypervisor configuration. We default to libvirt with **kvm** but will
# drop back to **qemu** if we are unable to load the kvm module. ``stack.sh`` can
# also install an **LXC**, **OpenVZ** or **XenAPI** based system. If xenserver-core