Merge "Add multi-region support to collectd plugins"
diff --git a/keystone/files/collectd_openstack_keystone.conf b/keystone/files/collectd_openstack_keystone.conf
index 61ea023..599229e 100644
--- a/keystone/files/collectd_openstack_keystone.conf
+++ b/keystone/files/collectd_openstack_keystone.conf
@@ -5,6 +5,7 @@
Username "{{ plugin.username }}"
Password "{{ plugin.password }}"
Tenant "{{ plugin.tenant }}"
+ Region "{{ plugin.region }}"
MaxRetries "2"
Timeout "20"
</Module>
diff --git a/keystone/meta/collectd.yml b/keystone/meta/collectd.yml
index 01e5e79..c2cf1c8 100644
--- a/keystone/meta/collectd.yml
+++ b/keystone/meta/collectd.yml
@@ -18,6 +18,7 @@
username: {{ server.admin_name }}
password: {{ server.admin_password }}
tenant: {{ server.admin_tenant }}
+ region: {{ server.region }}
check_openstack_api:
plugin: python
template: keystone/files/collectd_check_openstack_api.conf