Add multi-region support to collectd plugins
Change-Id: I9352dc957dbde33a44101b6a56ea715292e09bbe
diff --git a/neutron/files/collectd_openstack_neutron.conf b/neutron/files/collectd_openstack_neutron.conf
index 43bbf02..199e7ba 100644
--- a/neutron/files/collectd_openstack_neutron.conf
+++ b/neutron/files/collectd_openstack_neutron.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(100) }}"
diff --git a/neutron/files/collectd_openstack_neutron_agents.conf b/neutron/files/collectd_openstack_neutron_agents.conf
index 41a42b4..a86fffc 100644
--- a/neutron/files/collectd_openstack_neutron_agents.conf
+++ b/neutron/files/collectd_openstack_neutron_agents.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/neutron/meta/collectd.yml b/neutron/meta/collectd.yml
index e96fe23..ca77ce7 100644
--- a/neutron/meta/collectd.yml
+++ b/neutron/meta/collectd.yml
@@ -15,6 +15,7 @@
username: {{ server.identity.user }}
password: {{ server.identity.password }}
tenant: {{ server.identity.tenant }}
+ region: {{ server.identity.region }}
openstack_neutron_agents:
plugin: python
template: neutron/files/collectd_openstack_neutron_agents.conf
@@ -22,5 +23,6 @@
username: {{ server.identity.user }}
password: {{ server.identity.password }}
tenant: {{ server.identity.tenant }}
+ region: {{ server.identity.region }}
{%- endif %}
{%- endif %}