middleware in ceilometer has been broken into it's own lib. this
first patch adds the package.
Change-Id: I63795787b909effcc4fcdee7f262207bb59fd8c2
... | ... |
@@ -57,6 +57,7 @@ set +o xtrace |
57 | 57 |
|
58 | 58 |
# Set up default directories |
59 | 59 |
GITDIR["python-ceilometerclient"]=$DEST/python-ceilometerclient |
60 |
+GITDIR["ceilometermiddleware"]=$DEST/ceilometermiddleware |
|
60 | 61 |
|
61 | 62 |
CEILOMETER_DIR=$DEST/ceilometer |
62 | 63 |
CEILOMETER_CONF_DIR=/etc/ceilometer |
... | ... |
@@ -303,6 +304,14 @@ function install_ceilometerclient { |
303 | 303 |
fi |
304 | 304 |
} |
305 | 305 |
|
306 |
+# install_ceilometermiddleware() - Collect source and prepare |
|
307 |
+function install_ceilometermiddleware { |
|
308 |
+ if use_library_from_git "ceilometermiddleware"; then |
|
309 |
+ git_clone_by_name "ceilometermiddleware" |
|
310 |
+ setup_dev_lib "ceilometermiddleware" |
|
311 |
+ fi |
|
312 |
+} |
|
313 |
+ |
|
306 | 314 |
# start_ceilometer() - Start running processes, including screen |
307 | 315 |
function start_ceilometer { |
308 | 316 |
run_process ceilometer-acentral "ceilometer-agent-central --config-file $CEILOMETER_CONF" |
... | ... |
@@ -164,7 +164,7 @@ GIT_BASE=${GIT_BASE:-git://git.openstack.org} |
164 | 164 |
# |
165 | 165 |
############## |
166 | 166 |
|
167 |
-# metering service |
|
167 |
+# telemetry service |
|
168 | 168 |
CEILOMETER_REPO=${CEILOMETER_REPO:-${GIT_BASE}/openstack/ceilometer.git} |
169 | 169 |
CEILOMETER_BRANCH=${CEILOMETER_BRANCH:-master} |
170 | 170 |
|
... | ... |
@@ -407,6 +407,10 @@ GITBRANCH["keystonemiddleware"]=${KEYSTONEMIDDLEWARE_BRANCH:-master} |
407 | 407 |
SWIFT3_REPO=${SWIFT3_REPO:-${GIT_BASE}/stackforge/swift3.git} |
408 | 408 |
SWIFT3_BRANCH=${SWIFT3_BRANCH:-master} |
409 | 409 |
|
410 |
+# ceilometer middleware |
|
411 |
+GITREPO["ceilometermiddleware"]=${CEILOMETERMIDDLEWARE_REPO:-${GIT_BASE}/openstack/ceilometermiddleware.git} |
|
412 |
+GITBRANCH["ceilometermiddleware"]=${CEILOMETERMIDDLEWARE_BRANCH:-master} |
|
413 |
+ |
|
410 | 414 |
|
411 | 415 |
################## |
412 | 416 |
# |
... | ... |
@@ -29,7 +29,7 @@ for i in $TOP/lib/*; do |
29 | 29 |
fi |
30 | 30 |
done |
31 | 31 |
|
32 |
-ALL_LIBS="python-novaclient oslo.config pbr oslo.context python-troveclient python-keystoneclient taskflow oslo.middleware pycadf python-glanceclient python-ironicclient tempest-lib oslo.messaging oslo.log cliff python-heatclient stevedore python-cinderclient glance_store oslo.concurrency oslo.db oslo.vmware keystonemiddleware oslo.serialization python-saharaclient django_openstack_auth python-openstackclient oslo.rootwrap oslo.i18n python-ceilometerclient oslo.utils python-swiftclient python-neutronclient tooz" |
|
32 |
+ALL_LIBS="python-novaclient oslo.config pbr oslo.context python-troveclient python-keystoneclient taskflow oslo.middleware pycadf python-glanceclient python-ironicclient tempest-lib oslo.messaging oslo.log cliff python-heatclient stevedore python-cinderclient glance_store oslo.concurrency oslo.db oslo.vmware keystonemiddleware oslo.serialization python-saharaclient django_openstack_auth python-openstackclient oslo.rootwrap oslo.i18n python-ceilometerclient oslo.utils python-swiftclient python-neutronclient tooz ceilometermiddleware" |
|
33 | 33 |
|
34 | 34 |
# Generate the above list with |
35 | 35 |
# echo ${!GITREPO[@]} |