commit 4d8373426c7e6f65257da3ca5096027b3f726689
author Ales Komarek <akomarek@mirantis.com> Thu Mar 16 13:51:30 2017 +0000
committer Gerrit Code Review <gerrit2@8d47cb36f245> Thu Mar 16 13:51:30 2017 +0000
tree 79e207fdbcca3800eb603144725410b2fd0facd5
parent 5222e72b1b35b044978cabb5738db8f815fb5386
parent 9e76a651a2f7d5e1139d48301304ab4e21c2ad19

Merge "Fix Grafana dashboard for the novnc backends"

nova/files/collectd_hypervisor_stats.conf

diff --git a/nova/files/collectd_hypervisor_stats.conf b/nova/files/collectd_hypervisor_stats.conf
index 89ae226..26c2fa3 100644
--- a/nova/files/collectd_hypervisor_stats.conf
+++ b/nova/files/collectd_hypervisor_stats.conf
@@ -5,6 +5,7 @@
   Tenant "{{ plugin.project }}"
   Username "{{ plugin.user }}"
   Password "{{ plugin.password }}"
+  Region "{{ plugin.region }}"
   Timeout "5"
   CpuAllocationRatio "{{ plugin.cpu_allocation_ratio }}"
 </Module>

nova/files/collectd_openstack_nova.conf

diff --git a/nova/files/collectd_openstack_nova.conf b/nova/files/collectd_openstack_nova.conf
index 2fa58a2..b6b2714 100644
--- a/nova/files/collectd_openstack_nova.conf
+++ b/nova/files/collectd_openstack_nova.conf
@@ -5,6 +5,7 @@
   Tenant "{{ plugin.project }}"
   Username "{{ plugin.user }}"
   Password "{{ plugin.password }}"
+  Region "{{ plugin.region }}"
   Timeout "{{ plugin.timeout|default(20) }}"
   MaxRetries "{{ plugin.max_retries|default(2) }}"
   PaginationLimit "{{ plugin.pagination_limit|default(500) }}"

nova/files/collectd_openstack_nova_services.conf

diff --git a/nova/files/collectd_openstack_nova_services.conf b/nova/files/collectd_openstack_nova_services.conf
index 301f16b..a52c626 100644
--- a/nova/files/collectd_openstack_nova_services.conf
+++ b/nova/files/collectd_openstack_nova_services.conf
@@ -5,6 +5,7 @@
   Tenant "{{ plugin.project }}"
   Username "{{ plugin.user }}"
   Password "{{ plugin.password }}"
+  Region "{{ plugin.region }}"
   Timeout "20"
   MaxRetries "2"
 </Module>

nova/map.jinja

diff --git a/nova/map.jinja b/nova/map.jinja
index 5566170..b13868b 100644
--- a/nova/map.jinja
+++ b/nova/map.jinja
@@ -78,8 +78,3 @@
         'libvirt_service': 'libvirt-bin',
     },
 }, grain='oscodename', merge=pillar.nova.get('compute', {}))) %}
-
-{%- if salt['pillar.get']('linux:system:repo:mirantis_openstack' , False) or salt['pillar.get']('linux:system:repo:mirantis' , False) %}
-{%- do compute.update({'libvirt_bin': '/etc/default/libvirtd'}) %}
-{%- do compute.update({'libvirt_service': 'libvirtd'}) %}
-{%- endif %}

nova/meta/collectd.yml

diff --git a/nova/meta/collectd.yml b/nova/meta/collectd.yml
index 093d212..0dbf238 100644
--- a/nova/meta/collectd.yml
+++ b/nova/meta/collectd.yml
@@ -24,6 +24,7 @@
     project: {{ controller.identity.tenant }}
     user: {{ controller.identity.user }}
     password: {{ controller.identity.password }}
+    region: {{ controller.identity.region }}
   nova_services:
     plugin: python
     template: nova/files/collectd_openstack_nova_services.conf
@@ -31,6 +32,7 @@
     project: {{ controller.identity.tenant }}
     user: {{ controller.identity.user }}
     password: {{ controller.identity.password }}
+    region: {{ controller.identity.region }}
   nova_hypervisor_stats:
     plugin: python
     template: nova/files/collectd_hypervisor_stats.conf
@@ -38,6 +40,7 @@
     project: {{ controller.identity.tenant }}
     user: {{ controller.identity.user }}
     password: {{ controller.identity.password }}
+    region: {{ controller.identity.region }}
     cpu_allocation_ratio: {{ controller.cpu_allocation_ratio }}
 {%- endif %}
 {%- endif %}