openstack
/
ironic
Code Issues Proposed changes

devstack to `git pull sushy-tools` if required 

This change to devstack plugin code checks if `sushy-tools`
has been requested to be pulled from git rather than pypi.
This is a prerequisite for `sushy-tools` CI job to test the
Redfish emulator against Ironic conductor.

Change-Id: I548f5a19a266436edbb874ea14af67db711240be
This commit is contained in:
Ilya Etingof 2017-11-30 23:41:52 +01:00
parent 638943dbf8
commit 47b198cb0a
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devstack/lib/ironic
View File

@ -53,6 +53,10 @@ GITREPO["sushy"]=${SUSHY_REPO:-${GIT_BASE}/openstack/sushy.git}
GITBRANCH["sushy"]=${SUSHY_BRANCH:-master}
GITDIR["sushy"]=$DEST/sushy
GITREPO["sushy-tools"]=${SUSHY_TOOLS_REPO:-${GIT_BASE}/openstack/sushy-tools.git}
GITBRANCH["sushy-tools"]=${SUSHY_TOOLS_BRANCH:-master}
GITDIR["sushy-tools"]=$DEST/sushy-tools
IRONIC_DIR=$DEST/ironic
IRONIC_DEVSTACK_DIR=$IRONIC_DIR/devstack
IRONIC_DEVSTACK_FILES_DIR=$IRONIC_DEVSTACK_DIR/files
@ -699,7 +703,13 @@ function setup_redfish {
pip_install_gr "sushy"
fi
pip_install "sushy-tools"
if use_library_from_git "sushy-tools"; then
git_clone_by_name "sushy-tools"
setup_dev_lib "sushy-tools"
else
pip_install "sushy-tools"
fi
start_redfish_emulator
}