Install Ironic client
Since python-ironicclient was published to github it's reasonable to include it to the default Ironic set up. Change-Id: Id1d0209959a3b482977b5e710c0885c714ad7e10
This commit is contained in:
parent
13209d8b6d
commit
43e00660c3
20
lib/ironic
20
lib/ironic
@ -11,6 +11,7 @@
|
||||
# ``stack.sh`` calls the entry points in this order:
|
||||
#
|
||||
# install_ironic
|
||||
# install_ironicclient
|
||||
# configure_ironic
|
||||
# init_ironic
|
||||
# start_ironic
|
||||
@ -27,6 +28,7 @@ set +o xtrace
|
||||
|
||||
# Set up default directories
|
||||
IRONIC_DIR=$DEST/ironic
|
||||
IRONICCLIENT_DIR=$DEST/python-ironicclient
|
||||
IRONIC_AUTH_CACHE_DIR=${IRONIC_AUTH_CACHE_DIR:-/var/cache/ironic}
|
||||
IRONIC_CONF_DIR=${IRONIC_CONF_DIR:-/etc/ironic}
|
||||
IRONIC_CONF_FILE=$IRONIC_CONF_DIR/ironic.conf
|
||||
@ -45,6 +47,18 @@ IRONIC_HOSTPORT=${IRONIC_HOSTPORT:-$SERVICE_HOST:6385}
|
||||
# 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
|
||||
# runs that would need to clean up.
|
||||
function cleanup_ironic() {
|
||||
@ -170,12 +184,6 @@ function init_ironic() {
|
||||
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
|
||||
function start_ironic() {
|
||||
# Start Ironic API server, if enabled.
|
||||
|
1
stack.sh
1
stack.sh
@ -722,6 +722,7 @@ fi
|
||||
|
||||
if is_service_enabled ir-api ir-cond; then
|
||||
install_ironic
|
||||
install_ironicclient
|
||||
configure_ironic
|
||||
fi
|
||||
|
||||
|
4
stackrc
4
stackrc
@ -104,6 +104,10 @@ HORIZON_BRANCH=${HORIZON_BRANCH:-master}
|
||||
IRONIC_REPO=${IRONIC_REPO:-${GIT_BASE}/openstack/ironic.git}
|
||||
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)
|
||||
KEYSTONE_REPO=${KEYSTONE_REPO:-${GIT_BASE}/openstack/keystone.git}
|
||||
KEYSTONE_BRANCH=${KEYSTONE_BRANCH:-master}
|
||||
|
Loading…
Reference in New Issue
Block a user