openstack/devstack
Code Issues Proposed changes

Merge "Add keystone middleware to devstack"

Browse Source
This commit is contained in:
Jenkins 2014-07-01 19:46:16 +00:00 committed by Gerrit Code Review
commit 8a88f2728c
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/keystone
View File

@ -39,6 +39,7 @@ KEYSTONE_PASTE_INI=${KEYSTONE_PASTE_INI:-$KEYSTONE_CONF_DIR/keystone-paste.ini}
KEYSTONE_AUTH_CACHE_DIR=${KEYSTONE_AUTH_CACHE_DIR:-/var/cache/keystone} KEYSTONE_AUTH_CACHE_DIR=${KEYSTONE_AUTH_CACHE_DIR:-/var/cache/keystone}
KEYSTONE_WSGI_DIR=${KEYSTONE_WSGI_DIR:-/var/www/keystone} KEYSTONE_WSGI_DIR=${KEYSTONE_WSGI_DIR:-/var/www/keystone}
KEYSTONEMIDDLEWARE_DIR=$DEST/keystonemiddleware
KEYSTONECLIENT_DIR=$DEST/python-keystoneclient KEYSTONECLIENT_DIR=$DEST/python-keystoneclient
# Set up additional extensions, such as oauth1, federation # Set up additional extensions, such as oauth1, federation
@ -438,6 +439,12 @@ function install_keystoneclient {
sudo install -D -m 0644 -o $STACK_USER {$KEYSTONECLIENT_DIR/tools/,/etc/bash_completion.d/}keystone.bash_completion sudo install -D -m 0644 -o $STACK_USER {$KEYSTONECLIENT_DIR/tools/,/etc/bash_completion.d/}keystone.bash_completion
} }
# install_keystonemiddleware() - Collect source and prepare
function install_keystonemiddleware {
git_clone $KEYSTONEMIDDLEWARE_REPO $KEYSTONEMIDDLEWARE_DIR $KEYSTONEMIDDLEWARE_BRANCH
setup_install $KEYSTONEMIDDLEWARE_DIR
}
# install_keystone() - Collect source and prepare # install_keystone() - Collect source and prepare
function install_keystone { function install_keystone {
# only install ldap if the service has been enabled # only install ldap if the service has been enabled

3
stack.sh
View File

@ -722,6 +722,9 @@ if is_service_enabled heat horizon; then
install_heatclient install_heatclient
fi fi
# Install middleware
install_keystonemiddleware
git_clone $OPENSTACKCLIENT_REPO $OPENSTACKCLIENT_DIR $OPENSTACKCLIENT_BRANCH git_clone $OPENSTACKCLIENT_REPO $OPENSTACKCLIENT_DIR $OPENSTACKCLIENT_BRANCH
setup_develop $OPENSTACKCLIENT_DIR setup_develop $OPENSTACKCLIENT_DIR

4
stackrc
View File

@ -153,6 +153,10 @@ KEYSTONE_BRANCH=${KEYSTONE_BRANCH:-master}
KEYSTONECLIENT_REPO=${KEYSTONECLIENT_REPO:-${GIT_BASE}/openstack/python-keystoneclient.git} KEYSTONECLIENT_REPO=${KEYSTONECLIENT_REPO:-${GIT_BASE}/openstack/python-keystoneclient.git}
KEYSTONECLIENT_BRANCH=${KEYSTONECLIENT_BRANCH:-master} KEYSTONECLIENT_BRANCH=${KEYSTONECLIENT_BRANCH:-master}
# keystone middleware
KEYSTONEMIDDLEWARE_REPO=${KEYSTONEMIDDLEWARE_REPO:-${GIT_BASE}/openstack/keystonemiddleware.git}
KEYSTONEMIDDLEWARE_BRANCH=${KEYSTONEMIDDLEWARE_BRANCH:-master}
# compute service # compute service
NOVA_REPO=${NOVA_REPO:-${GIT_BASE}/openstack/nova.git} NOVA_REPO=${NOVA_REPO:-${GIT_BASE}/openstack/nova.git}
NOVA_BRANCH=${NOVA_BRANCH:-master} NOVA_BRANCH=${NOVA_BRANCH:-master}