Merge "Glance: start to use nova's glance configuration section"
diff --git a/AUTHORS b/AUTHORS
index c6b40d8..04bff48 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -48,3 +48,4 @@
Yun Mao <yunmao@gmail.com>
Yong Sheng Gong <gongysh@cn.ibm.com>
Zhongyue Luo <lzyeval@gmail.com>
+Zhenguo Niu <niu.zglinux@gmail.com>
diff --git a/lib/cinder b/lib/cinder
index 4183676..40a8418 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -275,7 +275,7 @@
fi
if is_service_enabled ceilometer; then
- iniset $CINDER_CONF DEFAULT notification_driver "cinder.openstack.common.notifier.rpc_notifier"
+ iniset $CINDER_CONF DEFAULT notification_driver "messaging"
fi
if is_service_enabled tls-proxy; then
diff --git a/lib/horizon b/lib/horizon
index 5d1df0b..bf476c6 100644
--- a/lib/horizon
+++ b/lib/horizon
@@ -26,6 +26,7 @@
# Set up default directories
HORIZON_DIR=$DEST/horizon
+HORIZONAUTH_DIR=$DEST/django_openstack_auth
# local_settings.py is used to customize Dashboard settings.
# The example file in Horizon repo is used by default.
@@ -155,6 +156,12 @@
}
+# install_django_openstack_auth() - Collect source and prepare
+function install_django_openstack_auth {
+ git_clone $HORIZONAUTH_REPO $HORIZONAUTH_DIR $HORIZONAUTH_BRANCH
+ setup_develop $HORIZONAUTH_DIR
+}
+
# install_horizon() - Collect source and prepare
function install_horizon {
# Apache installation, because we mark it NOPRIME
diff --git a/lib/oslo b/lib/oslo
index 1b47e66..a0a1f8f 100644
--- a/lib/oslo
+++ b/lib/oslo
@@ -54,6 +54,9 @@
git_clone $OSLORWRAP_REPO $OSLORWRAP_DIR $OSLORWRAP_BRANCH
setup_install $OSLORWRAP_DIR
+ git_clone $OSLODB_REPO $OSLODB_DIR $OSLODB_BRANCH
+ setup_install $OSLODB_DIR
+
git_clone $OSLOVMWARE_REPO $OSLOVMWARE_DIR $OSLOVMWARE_BRANCH
setup_install $OSLOVMWARE_DIR
diff --git a/stack.sh b/stack.sh
index f1ffb8a..e7cc9a2 100755
--- a/stack.sh
+++ b/stack.sh
@@ -757,6 +757,8 @@
fi
if is_service_enabled horizon; then
+ # django openstack_auth
+ install_django_openstack_auth
# dashboard
install_horizon
configure_horizon
diff --git a/stackrc b/stackrc
index 01d0e0f..a517fbb 100644
--- a/stackrc
+++ b/stackrc
@@ -133,6 +133,10 @@
HORIZON_REPO=${HORIZON_REPO:-${GIT_BASE}/openstack/horizon.git}
HORIZON_BRANCH=${HORIZON_BRANCH:-master}
+# django openstack_auth library
+HORIZONAUTH_REPO=${HORIZONAUTH_REPO:-${GIT_BASE}/openstack/django_openstack_auth.git}
+HORIZONAUTH_BRANCH=${HORIZONAUTH_BRANCH:-master}
+
# baremetal provisionint service
IRONIC_REPO=${IRONIC_REPO:-${GIT_BASE}/openstack/ironic.git}
IRONIC_BRANCH=${IRONIC_BRANCH:-master}