Browse code

Merge "Add support for oslo.versionedobjects"

Jenkins authored on 2015/03/07 01:04:59
Showing 3 changed files
... ...
@@ -36,6 +36,7 @@ GITDIR["oslo.policy"]=$DEST/oslo.policy
36 36
 GITDIR["oslo.rootwrap"]=$DEST/oslo.rootwrap
37 37
 GITDIR["oslo.serialization"]=$DEST/oslo.serialization
38 38
 GITDIR["oslo.utils"]=$DEST/oslo.utils
39
+GITDIR["oslo.versionedobjects"]=$DEST/oslo.versionedobjects
39 40
 GITDIR["oslo.vmware"]=$DEST/oslo.vmware
40 41
 GITDIR["pycadf"]=$DEST/pycadf
41 42
 GITDIR["stevedore"]=$DEST/stevedore
... ...
@@ -72,6 +73,7 @@ function install_oslo {
72 72
     _do_install_oslo_lib "oslo.rootwrap"
73 73
     _do_install_oslo_lib "oslo.serialization"
74 74
     _do_install_oslo_lib "oslo.utils"
75
+    _do_install_oslo_lib "oslo.versionedobjects"
75 76
     _do_install_oslo_lib "oslo.vmware"
76 77
     _do_install_oslo_lib "pycadf"
77 78
     _do_install_oslo_lib "stevedore"
... ...
@@ -358,6 +358,10 @@ GITBRANCH["oslo.serialization"]=${OSLOSERIALIZATION_BRANCH:-master}
358 358
 GITREPO["oslo.utils"]=${OSLOUTILS_REPO:-${GIT_BASE}/openstack/oslo.utils.git}
359 359
 GITBRANCH["oslo.utils"]=${OSLOUTILS_BRANCH:-master}
360 360
 
361
+# oslo.versionedobjects
362
+GITREPO["oslo.versionedobjects"]=${OSLOVERSIONEDOBJECTS_REPO:-${GIT_BASE}/openstack/oslo.versionedobjects.git}
363
+GITBRANCH["oslo.versionedobjects"]=${OSLOVERSIONEDOBJECTS_BRANCH:-master}
364
+
361 365
 # oslo.vmware
362 366
 GITREPO["oslo.vmware"]=${OSLOVMWARE_REPO:-${GIT_BASE}/openstack/oslo.vmware.git}
363 367
 GITBRANCH["oslo.vmware"]=${OSLOVMWARE_BRANCH:-master}
... ...
@@ -34,8 +34,8 @@ ALL_LIBS+=" python-keystoneclient taskflow oslo.middleware pycadf"
34 34
 ALL_LIBS+=" python-glanceclient python-ironicclient tempest-lib"
35 35
 ALL_LIBS+=" oslo.messaging oslo.log cliff python-heatclient stevedore"
36 36
 ALL_LIBS+=" python-cinderclient glance_store oslo.concurrency oslo.db"
37
-ALL_LIBS+=" oslo.vmware keystonemiddleware oslo.serialization"
38
-ALL_LIBS+=" python-saharaclient django_openstack_auth"
37
+ALL_LIBS+=" oslo.versionedobjects oslo.vmware keystonemiddleware"
38
+ALL_LIBS+=" oslo.serialization python-saharaclient django_openstack_auth"
39 39
 ALL_LIBS+=" python-openstackclient oslo.rootwrap oslo.i18n"
40 40
 ALL_LIBS+=" python-ceilometerclient oslo.utils python-swiftclient"
41 41
 ALL_LIBS+=" python-neutronclient tooz ceilometermiddleware oslo.policy"