Browse code

Merge "Add new oslo libraries"

Jenkins authored on 2015/07/02 10:57:20
Showing 3 changed files
... ...
@@ -36,6 +36,7 @@ GITDIR["oslo.log"]=$DEST/oslo.log
36 36
 GITDIR["oslo.messaging"]=$DEST/oslo.messaging
37 37
 GITDIR["oslo.middleware"]=$DEST/oslo.middleware
38 38
 GITDIR["oslo.policy"]=$DEST/oslo.policy
39
+GITDIR["oslo.reports"]=$DEST/oslo.reports
39 40
 GITDIR["oslo.rootwrap"]=$DEST/oslo.rootwrap
40 41
 GITDIR["oslo.serialization"]=$DEST/oslo.serialization
41 42
 GITDIR["oslo.service"]=$DEST/oslo.service
... ...
@@ -64,6 +65,7 @@ function _do_install_oslo_lib {
64 64
 
65 65
 # install_oslo() - Collect source and prepare
66 66
 function install_oslo {
67
+    _do_install_oslo_lib "automaton"
67 68
     _do_install_oslo_lib "cliff"
68 69
     _do_install_oslo_lib "debtcollector"
69 70
     _do_install_oslo_lib "futurist"
... ...
@@ -77,6 +79,7 @@ function install_oslo {
77 77
     _do_install_oslo_lib "oslo.messaging"
78 78
     _do_install_oslo_lib "oslo.middleware"
79 79
     _do_install_oslo_lib "oslo.policy"
80
+    _do_install_oslo_lib "oslo.reports"
80 81
     _do_install_oslo_lib "oslo.rootwrap"
81 82
     _do_install_oslo_lib "oslo.serialization"
82 83
     _do_install_oslo_lib "oslo.service"
... ...
@@ -367,6 +367,10 @@ GITBRANCH["oslo.middleware"]=${OSLOMID_BRANCH:-master}
367 367
 GITREPO["oslo.policy"]=${OSLOPOLICY_REPO:-${GIT_BASE}/openstack/oslo.policy.git}
368 368
 GITBRANCH["oslo.policy"]=${OSLOPOLICY_BRANCH:-master}
369 369
 
370
+# oslo.reports
371
+GITREPO["oslo.reports"]=${OSLOREPORTS_REPO:-${GIT_BASE}/openstack/oslo.reports.git}
372
+GITBRANCH["oslo.reports"]=${OSLOREPORTS_BRANCH:-master}
373
+
370 374
 # oslo.rootwrap
371 375
 GITREPO["oslo.rootwrap"]=${OSLORWRAP_REPO:-${GIT_BASE}/openstack/oslo.rootwrap.git}
372 376
 GITBRANCH["oslo.rootwrap"]=${OSLORWRAP_BRANCH:-master}
... ...
@@ -40,7 +40,7 @@ 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"
42 42
 ALL_LIBS+=" debtcollector os-brick automaton futurist oslo.service"
43
-ALL_LIBS+=" oslo.cache"
43
+ALL_LIBS+=" oslo.cache oslo.reports"
44 44
 
45 45
 # Generate the above list with
46 46
 # echo ${!GITREPO[@]}