Ceilometer client CLI is helpful to develop ceilometer related code. Add
it to devstack also involve more developer to use it.
Change-Id: I4147e50c00cb520ec15d63a0c34524ba8cb6654f
Signed-off-by: Yunhong, Jiang <yunhong.jiang@intel.com>
| ... | ... |
@@ -29,6 +29,7 @@ set +o xtrace |
| 29 | 29 |
|
| 30 | 30 |
# Set up default directories |
| 31 | 31 |
CEILOMETER_DIR=$DEST/ceilometer |
| 32 |
+CEILOMETERCLIENT_DIR=$DEST/python-ceilometerclient |
|
| 32 | 33 |
CEILOMETER_CONF_DIR=/etc/ceilometer |
| 33 | 34 |
CEILOMETER_CONF=$CEILOMETER_CONF_DIR/ceilometer.conf |
| 34 | 35 |
CEILOMETER_API_LOG_DIR=/var/log/ceilometer-api |
| ... | ... |
@@ -46,6 +47,11 @@ function cleanup_ceilometer() {
|
| 46 | 46 |
mongo ceilometer --eval "db.dropDatabase();" |
| 47 | 47 |
} |
| 48 | 48 |
|
| 49 |
+# configure_ceilometerclient() - Set config files, create data dirs, etc |
|
| 50 |
+function configure_ceilometerclient() {
|
|
| 51 |
+ setup_develop $CEILOMETERCLIENT_DIR |
|
| 52 |
+} |
|
| 53 |
+ |
|
| 49 | 54 |
# configure_ceilometer() - Set config files, create data dirs, etc |
| 50 | 55 |
function configure_ceilometer() {
|
| 51 | 56 |
setup_develop $CEILOMETER_DIR |
| ... | ... |
@@ -87,6 +93,11 @@ function install_ceilometer() {
|
| 87 | 87 |
git_clone $CEILOMETER_REPO $CEILOMETER_DIR $CEILOMETER_BRANCH |
| 88 | 88 |
} |
| 89 | 89 |
|
| 90 |
+# install_ceilometerclient() - Collect source and prepare |
|
| 91 |
+function install_ceilometerclient() {
|
|
| 92 |
+ git_clone $CEILOMETERCLIENT_REPO $CEILOMETERCLIENT_DIR $CEILOMETERCLIENT_BRANCH |
|
| 93 |
+} |
|
| 94 |
+ |
|
| 90 | 95 |
# start_ceilometer() - Start running processes, including screen |
| 91 | 96 |
function start_ceilometer() {
|
| 92 | 97 |
screen_it ceilometer-acompute "cd $CEILOMETER_DIR && sg libvirtd \"$CEILOMETER_BIN_DIR/ceilometer-agent-compute --config-file $CEILOMETER_CONF\"" |
| ... | ... |
@@ -773,6 +773,7 @@ if is_service_enabled cinder; then |
| 773 | 773 |
install_cinder |
| 774 | 774 |
fi |
| 775 | 775 |
if is_service_enabled ceilometer; then |
| 776 |
+ install_ceilometerclient |
|
| 776 | 777 |
install_ceilometer |
| 777 | 778 |
fi |
| 778 | 779 |
if is_service_enabled tempest; then |
| ... | ... |
@@ -1218,6 +1219,7 @@ fi |
| 1218 | 1218 |
if is_service_enabled ceilometer; then |
| 1219 | 1219 |
echo_summary "Configuring Ceilometer" |
| 1220 | 1220 |
configure_ceilometer |
| 1221 |
+ configure_ceilometerclient |
|
| 1221 | 1222 |
echo_summary "Starting Ceilometer" |
| 1222 | 1223 |
start_ceilometer |
| 1223 | 1224 |
fi |
| ... | ... |
@@ -33,6 +33,10 @@ GIT_BASE=https://github.com |
| 33 | 33 |
CEILOMETER_REPO=${GIT_BASE}/openstack/ceilometer.git
|
| 34 | 34 |
CEILOMETER_BRANCH=master |
| 35 | 35 |
|
| 36 |
+# ceilometer client library |
|
| 37 |
+CEILOMETERCLIENT_REPO=${GIT_BASE}/openstack/python-ceilometerclient
|
|
| 38 |
+CEILOMETERCLIENT_BRANCH=master |
|
| 39 |
+ |
|
| 36 | 40 |
# volume service |
| 37 | 41 |
CINDER_REPO=${GIT_BASE}/openstack/cinder
|
| 38 | 42 |
CINDER_BRANCH=master |