openstack/devstack
Code Issues Proposed changes

Merge "Install Ironic client"

Browse Source
This commit is contained in:
Jenkins 2013-10-22 12:29:27 +00:00 committed by Gerrit Code Review
commit 4d23ff525e
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/ironic
View File

@ -11,6 +11,7 @@
# ``stack.sh`` calls the entry points in this order: # ``stack.sh`` calls the entry points in this order:
# #
# install_ironic # install_ironic
# install_ironicclient
# configure_ironic # configure_ironic
# init_ironic # init_ironic
# start_ironic # start_ironic
@ -27,6 +28,7 @@ set +o xtrace
# Set up default directories # Set up default directories
IRONIC_DIR=$DEST/ironic IRONIC_DIR=$DEST/ironic
IRONICCLIENT_DIR=$DEST/python-ironicclient
IRONIC_AUTH_CACHE_DIR=${IRONIC_AUTH_CACHE_DIR:-/var/cache/ironic} IRONIC_AUTH_CACHE_DIR=${IRONIC_AUTH_CACHE_DIR:-/var/cache/ironic}
IRONIC_CONF_DIR=${IRONIC_CONF_DIR:-/etc/ironic} IRONIC_CONF_DIR=${IRONIC_CONF_DIR:-/etc/ironic}
IRONIC_CONF_FILE=$IRONIC_CONF_DIR/ironic.conf IRONIC_CONF_FILE=$IRONIC_CONF_DIR/ironic.conf
@ -45,6 +47,18 @@ IRONIC_HOSTPORT=${IRONIC_HOSTPORT:-$SERVICE_HOST:6385}
# Functions # Functions
# --------- # ---------
# install_ironic() - Collect source and prepare
function install_ironic() {
git_clone $IRONIC_REPO $IRONIC_DIR $IRONIC_BRANCH
setup_develop $IRONIC_DIR
}
# install_ironicclient() - Collect sources and prepare
function install_ironicclient() {
git_clone $IRONICCLIENT_REPO $IRONICCLIENT_DIR $IRONICCLIENT_BRANCH
setup_develop $IRONICCLIENT_DIR
}
# cleanup_ironic() - Remove residual data files, anything left over from previous # cleanup_ironic() - Remove residual data files, anything left over from previous
# runs that would need to clean up. # runs that would need to clean up.
function cleanup_ironic() { function cleanup_ironic() {
@ -170,12 +184,6 @@ function init_ironic() {
create_ironic_accounts create_ironic_accounts
} }
# install_ironic() - Collect source and prepare
function install_ironic() {
git_clone $IRONIC_REPO $IRONIC_DIR $IRONIC_BRANCH
setup_develop $IRONIC_DIR
}
# start_ironic() - Start running processes, including screen # start_ironic() - Start running processes, including screen
function start_ironic() { function start_ironic() {
# Start Ironic API server, if enabled. # Start Ironic API server, if enabled.

1
stack.sh
View File

@ -732,6 +732,7 @@ fi
if is_service_enabled ir-api ir-cond; then if is_service_enabled ir-api ir-cond; then
install_ironic install_ironic
install_ironicclient
configure_ironic configure_ironic
fi fi

4
stackrc
View File

@ -104,6 +104,10 @@ HORIZON_BRANCH=${HORIZON_BRANCH:-master}
IRONIC_REPO=${IRONIC_REPO:-${GIT_BASE}/openstack/ironic.git} IRONIC_REPO=${IRONIC_REPO:-${GIT_BASE}/openstack/ironic.git}
IRONIC_BRANCH=${IRONIC_BRANCH:-master} IRONIC_BRANCH=${IRONIC_BRANCH:-master}
# ironic client
IRONICCLIENT_REPO=${IRONICCLIENT_REPO:-${GIT_BASE}/openstack/python-ironicclient.git}
IRONICCLIENT_BRANCH=${IRONICCLIENT_BRANCH:-master}
# unified auth system (manages accounts/tokens) # unified auth system (manages accounts/tokens)
KEYSTONE_REPO=${KEYSTONE_REPO:-${GIT_BASE}/openstack/keystone.git} KEYSTONE_REPO=${KEYSTONE_REPO:-${GIT_BASE}/openstack/keystone.git}
KEYSTONE_BRANCH=${KEYSTONE_BRANCH:-master} KEYSTONE_BRANCH=${KEYSTONE_BRANCH:-master}