openstack/devstack
Code Issues Proposed changes

placement: install osc-placement

Browse Source 
This makes sure that the openstack client placement plugin gets
installed when either LIBS_FROM_GIT includes osc-placement or
placement is used, which is always now if you've enabled nova,
which is enabled by default.

Co-Authored-By: Matt Riedemann <mriedem.os@gmail.com>

Depends-On: Ica83e29780722dd1555904e46b9ff1d1fdf72516

Change-Id: I7c5a5c10288b356302bb3027837d4ed4f0fbad8c
This commit is contained in:
Roman Podoliaka 2017-04-18 16:18:14 +03:00 committed by Sean Dague
parent 63651db44d
commit a066abedac
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libraries
View File

@ -30,6 +30,7 @@ GITDIR["debtcollector"]=$DEST/debtcollector
GITDIR["futurist"]=$DEST/futurist GITDIR["futurist"]=$DEST/futurist
GITDIR["os-client-config"]=$DEST/os-client-config GITDIR["os-client-config"]=$DEST/os-client-config
GITDIR["osc-lib"]=$DEST/osc-lib GITDIR["osc-lib"]=$DEST/osc-lib
GITDIR["osc-placement"]=$DEST/osc-placement
GITDIR["oslo.cache"]=$DEST/oslo.cache GITDIR["oslo.cache"]=$DEST/oslo.cache
GITDIR["oslo.concurrency"]=$DEST/oslo.concurrency GITDIR["oslo.concurrency"]=$DEST/oslo.concurrency
GITDIR["oslo.config"]=$DEST/oslo.config GITDIR["oslo.config"]=$DEST/oslo.config
@ -91,6 +92,7 @@ function install_libs {
_install_lib_from_source "debtcollector" _install_lib_from_source "debtcollector"
_install_lib_from_source "futurist" _install_lib_from_source "futurist"
_install_lib_from_source "osc-lib" _install_lib_from_source "osc-lib"
_install_lib_from_source "osc-placement"
_install_lib_from_source "os-client-config" _install_lib_from_source "os-client-config"
_install_lib_from_source "oslo.cache" _install_lib_from_source "oslo.cache"
_install_lib_from_source "oslo.concurrency" _install_lib_from_source "oslo.concurrency"

3
lib/placement
View File

@ -159,6 +159,9 @@ function init_placement {
# install_placement() - Collect source and prepare # install_placement() - Collect source and prepare
function install_placement { function install_placement {
install_apache_wsgi install_apache_wsgi
# Install the openstackclient placement client plugin for CLI
# TODO(mriedem): Use pip_install_gr once osc-placement is in g-r.
pip_install osc-placement
} }
# start_placement_api() - Start the API processes ahead of other things # start_placement_api() - Start the API processes ahead of other things

4
stackrc
View File

@ -388,6 +388,10 @@ GITBRANCH["python-openstackclient"]=${OPENSTACKCLIENT_BRANCH:-master}
# this doesn't exist in a lib file, so set it here # this doesn't exist in a lib file, so set it here
GITDIR["python-openstackclient"]=$DEST/python-openstackclient GITDIR["python-openstackclient"]=$DEST/python-openstackclient
# placement-api CLI
GITREPO["osc-placement"]=${OSC_PLACEMENT_REPO:-${GIT_BASE}/openstack/osc-placement.git}
GITBRANCH["osc-placement"]=${OSC_PLACEMENT_BRANCH:-master}
################### ###################
# #

3
tests/test_libs_from_pypi.sh
View File

@ -36,7 +36,8 @@ ALL_LIBS+=" oslo.messaging oslo.log cliff stevedore"
ALL_LIBS+=" python-cinderclient glance_store oslo.concurrency oslo.db" ALL_LIBS+=" python-cinderclient glance_store oslo.concurrency oslo.db"
ALL_LIBS+=" oslo.versionedobjects oslo.vmware keystonemiddleware" ALL_LIBS+=" oslo.versionedobjects oslo.vmware keystonemiddleware"
ALL_LIBS+=" oslo.serialization django_openstack_auth" ALL_LIBS+=" oslo.serialization django_openstack_auth"
ALL_LIBS+=" python-openstackclient osc-lib os-client-config oslo.rootwrap" ALL_LIBS+=" python-openstackclient osc-lib osc-placement"
ALL_LIBS+=" os-client-config oslo.rootwrap"
ALL_LIBS+=" oslo.i18n oslo.utils python-openstacksdk python-swiftclient" ALL_LIBS+=" oslo.i18n oslo.utils python-openstacksdk python-swiftclient"
ALL_LIBS+=" python-neutronclient tooz ceilometermiddleware oslo.policy" ALL_LIBS+=" python-neutronclient tooz ceilometermiddleware oslo.policy"
ALL_LIBS+=" debtcollector os-brick os-traits automaton futurist oslo.service" ALL_LIBS+=" debtcollector os-brick os-traits automaton futurist oslo.service"