Add multi-region support to collectd plugins

Change-Id: I611e945e02926719103a98ee0bbace7bcea380d6
diff --git a/glance/files/collectd_openstack_glance.conf b/glance/files/collectd_openstack_glance.conf
index 3fb160e..5fb91c4 100644
--- a/glance/files/collectd_openstack_glance.conf
+++ b/glance/files/collectd_openstack_glance.conf
@@ -5,6 +5,7 @@
     Username "{{ plugin.username }}"
     Password "{{ plugin.password }}"
     Tenant "{{ plugin.tenant }}"
+    Region "{{ plugin.region }}"
     MaxRetries "{{ plugin.max_retries|default(2) }}"
     Timeout "{{ plugin.timeout|default(20) }}"
     PaginationLimit "{{ plugin.pagination_limit|default(25) }}"
diff --git a/glance/meta/collectd.yml b/glance/meta/collectd.yml
index edcd624..1c9ce84 100644
--- a/glance/meta/collectd.yml
+++ b/glance/meta/collectd.yml
@@ -15,4 +15,5 @@
     username: {{ server.identity.user }}
     password: {{ server.identity.password }}
     tenant: {{ server.identity.tenant }}
+    region: {{ server.identity.region }}
 {%- endif %}