@@ -54,6 +54,11 @@ GITDIR["python-openstacksdk"]=$DEST/python-openstacksdk

 GITDIR["stevedore"]=$DEST/stevedore

 GITDIR["taskflow"]=$DEST/taskflow

 GITDIR["tooz"]=$DEST/tooz

+# TODO(mriedem): This is a common pattern so even though os-traits isn't

+# officially an oslo library, it is nice to re-use this script for non-oslo

+# things like os-traits. We should rename this script to be more generic

+# and then fold os-brick into it also.

+GITDIR["os-traits"]=$DEST/os-traits

 # Support entry points installation of console scripts

 OSLO_BIN_DIR=$(get_python_exec_prefix)

@@ -104,6 +109,7 @@ function install_oslo {

     _do_install_oslo_lib "stevedore"

     _do_install_oslo_lib "taskflow"

     _do_install_oslo_lib "tooz"

+    _do_install_oslo_lib "os-traits"

 }

 # Restore xtrace

@@ -570,6 +570,10 @@ GITREPO["neutron-lib"]=${NEUTRON_LIB_REPO:-${GIT_BASE}/openstack/neutron-lib.git

 GITBRANCH["neutron-lib"]=${NEUTRON_LIB_BRANCH:-master}

 GITDIR["neutron-lib"]=$DEST/neutron-lib

+# os-traits library for resource provider traits in the placement service

+GITREPO["os-traits"]=${OS_TRAITS_REPO:-${GIT_BASE}/openstack/os-traits.git}

+GITBRANCH["os-traits"]=${OS_TRAITS_BRANCH:-master}

+

 ##################

 #

 #  TripleO / Heat Agent Components

@@ -39,7 +39,7 @@ ALL_LIBS+=" oslo.serialization django_openstack_auth"

 ALL_LIBS+=" python-openstackclient osc-lib os-client-config oslo.rootwrap"

 ALL_LIBS+=" oslo.i18n oslo.utils python-openstacksdk python-swiftclient"

 ALL_LIBS+=" python-neutronclient tooz ceilometermiddleware oslo.policy"

-ALL_LIBS+=" debtcollector os-brick automaton futurist oslo.service"

+ALL_LIBS+=" debtcollector os-brick os-traits automaton futurist oslo.service"

 ALL_LIBS+=" oslo.cache oslo.reports osprofiler cursive"

 ALL_LIBS+=" keystoneauth ironic-lib neutron-lib oslo.privsep"

 ALL_LIBS+=" diskimage-builder os-vif python-brick-cinderclient-ext"