summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-05-21 17:03:05 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-06-04 13:50:06 +0000
commitc449be5003e2e607fe9541f054269f6ef22bcc5e (patch)
tree0612b75863bd0ae0cd6e76488a3286ba62fa28e3 /extensions
parent1c288ed25a6dc08bceeb673d42a1c86cc8b6ff2b (diff)
downloaddefinitions-c449be5003e2e607fe9541f054269f6ef22bcc5e.tar.gz
Openstack: Add back the custom configuration for ceilometer
Add configuration to get VM information using libvirt. Change-Id: I3f1f272600b89abe64d7361acedfd6447a90d0b9
Diffstat (limited to 'extensions')
-rw-r--r--extensions/openstack-ceilometer.configure2
1 files changed, 2 insertions, 0 deletions
diff --git a/extensions/openstack-ceilometer.configure b/extensions/openstack-ceilometer.configure
index 9c0b7b6d..a98c4d73 100644
--- a/extensions/openstack-ceilometer.configure
+++ b/extensions/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)