openstack/devstack
Code Issues Proposed changes

Add oslo.service to devstack

Browse Source 
Add the ability to switch on oslo.service master using
LIBS_FROM_GIT

Change-Id: I00fe7776aea005b6d4e0a84fce54f33a862b57e3
This commit is contained in:
Davanum Srinivas 2015-06-18 06:32:00 -04:00
parent 810dc1d6f4
commit 18d1cca6cb
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/oslo
View File

@ -37,6 +37,7 @@ GITDIR["oslo.middleware"]=$DEST/oslo.middleware
GITDIR["oslo.policy"]=$DEST/oslo.policy GITDIR["oslo.policy"]=$DEST/oslo.policy
GITDIR["oslo.rootwrap"]=$DEST/oslo.rootwrap GITDIR["oslo.rootwrap"]=$DEST/oslo.rootwrap
GITDIR["oslo.serialization"]=$DEST/oslo.serialization GITDIR["oslo.serialization"]=$DEST/oslo.serialization
GITDIR["oslo.service"]=$DEST/oslo.service
GITDIR["oslo.utils"]=$DEST/oslo.utils GITDIR["oslo.utils"]=$DEST/oslo.utils
GITDIR["oslo.versionedobjects"]=$DEST/oslo.versionedobjects GITDIR["oslo.versionedobjects"]=$DEST/oslo.versionedobjects
GITDIR["oslo.vmware"]=$DEST/oslo.vmware GITDIR["oslo.vmware"]=$DEST/oslo.vmware
@ -76,6 +77,7 @@ function install_oslo {
_do_install_oslo_lib "oslo.policy" _do_install_oslo_lib "oslo.policy"
_do_install_oslo_lib "oslo.rootwrap" _do_install_oslo_lib "oslo.rootwrap"
_do_install_oslo_lib "oslo.serialization" _do_install_oslo_lib "oslo.serialization"
_do_install_oslo_lib "oslo.service"
_do_install_oslo_lib "oslo.utils" _do_install_oslo_lib "oslo.utils"
_do_install_oslo_lib "oslo.versionedobjects" _do_install_oslo_lib "oslo.versionedobjects"
_do_install_oslo_lib "oslo.vmware" _do_install_oslo_lib "oslo.vmware"

4
stackrc
View File

@ -382,6 +382,10 @@ GITBRANCH["oslo.rootwrap"]=${OSLORWRAP_BRANCH:-master}
GITREPO["oslo.serialization"]=${OSLOSERIALIZATION_REPO:-${GIT_BASE}/openstack/oslo.serialization.git} GITREPO["oslo.serialization"]=${OSLOSERIALIZATION_REPO:-${GIT_BASE}/openstack/oslo.serialization.git}
GITBRANCH["oslo.serialization"]=${OSLOSERIALIZATION_BRANCH:-master} GITBRANCH["oslo.serialization"]=${OSLOSERIALIZATION_BRANCH:-master}
# oslo.service
GITREPO["oslo.service"]=${OSLOSERVICE_REPO:-${GIT_BASE}/openstack/oslo.service.git}
GITBRANCH["oslo.service"]=${OSLOSERVICE_BRANCH:-master}
# oslo.utils # oslo.utils
GITREPO["oslo.utils"]=${OSLOUTILS_REPO:-${GIT_BASE}/openstack/oslo.utils.git} GITREPO["oslo.utils"]=${OSLOUTILS_REPO:-${GIT_BASE}/openstack/oslo.utils.git}
GITBRANCH["oslo.utils"]=${OSLOUTILS_BRANCH:-master} GITBRANCH["oslo.utils"]=${OSLOUTILS_BRANCH:-master}

2
tests/test_libs_from_pypi.sh
View File

@ -39,7 +39,7 @@ ALL_LIBS+=" oslo.serialization python-saharaclient django_openstack_auth"
ALL_LIBS+=" python-openstackclient oslo.rootwrap oslo.i18n" ALL_LIBS+=" python-openstackclient oslo.rootwrap oslo.i18n"
ALL_LIBS+=" python-ceilometerclient oslo.utils python-swiftclient" ALL_LIBS+=" python-ceilometerclient oslo.utils python-swiftclient"
ALL_LIBS+=" python-neutronclient tooz ceilometermiddleware oslo.policy" ALL_LIBS+=" python-neutronclient tooz ceilometermiddleware oslo.policy"
ALL_LIBS+=" debtcollector os-brick automaton futurist" ALL_LIBS+=" debtcollector os-brick automaton futurist oslo.service"
# Generate the above list with # Generate the above list with
# echo ${!GITREPO[@]} # echo ${!GITREPO[@]}