Add the keystonemiddleware repository to devstack to support testing
with tempest and stable branches.
Change-Id: Ib635465e6568d9cd51d6e432ec8b8633a27d19ce
... | ... |
@@ -39,6 +39,7 @@ KEYSTONE_PASTE_INI=${KEYSTONE_PASTE_INI:-$KEYSTONE_CONF_DIR/keystone-paste.ini} |
39 | 39 |
KEYSTONE_AUTH_CACHE_DIR=${KEYSTONE_AUTH_CACHE_DIR:-/var/cache/keystone} |
40 | 40 |
KEYSTONE_WSGI_DIR=${KEYSTONE_WSGI_DIR:-/var/www/keystone} |
41 | 41 |
|
42 |
+KEYSTONEMIDDLEWARE_DIR=$DEST/keystonemiddleware |
|
42 | 43 |
KEYSTONECLIENT_DIR=$DEST/python-keystoneclient |
43 | 44 |
|
44 | 45 |
# Set up additional extensions, such as oauth1, federation |
... | ... |
@@ -438,6 +439,12 @@ function install_keystoneclient { |
438 | 438 |
sudo install -D -m 0644 -o $STACK_USER {$KEYSTONECLIENT_DIR/tools/,/etc/bash_completion.d/}keystone.bash_completion |
439 | 439 |
} |
440 | 440 |
|
441 |
+# install_keystonemiddleware() - Collect source and prepare |
|
442 |
+function install_keystonemiddleware { |
|
443 |
+ git_clone $KEYSTONEMIDDLEWARE_REPO $KEYSTONEMIDDLEWARE_DIR $KEYSTONEMIDDLEWARE_BRANCH |
|
444 |
+ setup_install $KEYSTONEMIDDLEWARE_DIR |
|
445 |
+} |
|
446 |
+ |
|
441 | 447 |
# install_keystone() - Collect source and prepare |
442 | 448 |
function install_keystone { |
443 | 449 |
# only install ldap if the service has been enabled |
... | ... |
@@ -722,6 +722,9 @@ if is_service_enabled heat horizon; then |
722 | 722 |
install_heatclient |
723 | 723 |
fi |
724 | 724 |
|
725 |
+# Install middleware |
|
726 |
+install_keystonemiddleware |
|
727 |
+ |
|
725 | 728 |
git_clone $OPENSTACKCLIENT_REPO $OPENSTACKCLIENT_DIR $OPENSTACKCLIENT_BRANCH |
726 | 729 |
setup_develop $OPENSTACKCLIENT_DIR |
727 | 730 |
|
... | ... |
@@ -153,6 +153,10 @@ KEYSTONE_BRANCH=${KEYSTONE_BRANCH:-master} |
153 | 153 |
KEYSTONECLIENT_REPO=${KEYSTONECLIENT_REPO:-${GIT_BASE}/openstack/python-keystoneclient.git} |
154 | 154 |
KEYSTONECLIENT_BRANCH=${KEYSTONECLIENT_BRANCH:-master} |
155 | 155 |
|
156 |
+# keystone middleware |
|
157 |
+KEYSTONEMIDDLEWARE_REPO=${KEYSTONEMIDDLEWARE_REPO:-${GIT_BASE}/openstack/keystonemiddleware.git} |
|
158 |
+KEYSTONEMIDDLEWARE_BRANCH=${KEYSTONEMIDDLEWARE_BRANCH:-master} |
|
159 |
+ |
|
156 | 160 |
# compute service |
157 | 161 |
NOVA_REPO=${NOVA_REPO:-${GIT_BASE}/openstack/nova.git} |
158 | 162 |
NOVA_BRANCH=${NOVA_BRANCH:-master} |