summaryrefslogtreecommitdiff
path: root/openstack-ceilometer.configure
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-05-21 17:03:05 +0000
committerTiago Gomes <tiago.gomes@codethink.co.uk>2015-05-28 17:43:51 +0000
commit9a5bd65a65f3f287fcc2e0619aa271fa58b60b86 (patch)
tree81bd648368005a0445875ab3adbd9029eb679ac7 /openstack-ceilometer.configure
parent65813c6f854f3f81f55ed2fa58d08418f799f96b (diff)
downloaddefinitions-9a5bd65a65f3f287fcc2e0619aa271fa58b60b86.tar.gz
Openstack: Add back the custom configuration for ceilometer
Add configuration to get VM information using libvirt. Change-Id: I3f1f272600b89abe64d7361acedfd6447a90d0b9
Diffstat (limited to 'openstack-ceilometer.configure')
-rw-r--r--openstack-ceilometer.configure2
1 files changed, 2 insertions, 0 deletions
diff --git a/openstack-ceilometer.configure b/openstack-ceilometer.configure
index 9c0b7b6d..a98c4d73 100644
--- a/openstack-ceilometer.configure
+++ b/openstack-ceilometer.configure
@@ -66,6 +66,7 @@ if [ -z "$KEYSTONE_TEMPORARY_ADMIN_TOKEN" -o \
-z "$RABBITMQ_USER" -o \
-z "$RABBITMQ_PASSWORD" -o \
-z "$MANAGEMENT_INTERFACE_IP_ADDRESS" -o \
+ -z "$NOVA_VIRT_TYPE" -o \
-z "$CONTROLLER_HOST_ADDRESS" ]; then
echo Some options required for Ceilometer were defined, but not all.
exit 1
@@ -114,6 +115,7 @@ ceilometer_configuration={
'RABBITMQ_PASSWORD': os.environ['RABBITMQ_PASSWORD'],
'MANAGEMENT_INTERFACE_IP_ADDRESS': os.environ['MANAGEMENT_INTERFACE_IP_ADDRESS'],
'CONTROLLER_HOST_ADDRESS': os.environ['CONTROLLER_HOST_ADDRESS'],
+ 'NOVA_VIRT_TYPE': os.environ['NOVA_VIRT_TYPE'],
}
yaml.dump(ceilometer_configuration, sys.stdout, default_flow_style=False)