openstack
/
puppet-monasca
Code Issues Proposed changes

Add configuration of ovs publish_router_capacity flag 

Change-Id: I0431bee6f8cd92a6e01a4776f333af2e47454c1f
This commit is contained in:
Brad Klein 2017-01-27 07:59:26 -07:00
parent 6bb4ee6296
commit 39465dfe31
3 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
manifests/checks/ovs.pp
View File

@ -51,6 +51,11 @@
# (Optional) Command to run to get ovs data.
# Defaults to 'sudo /usr/bin/ovs-vsctl'.
#
# [*publish_router_capacity*]
# (Optional) Flag indicating if router capacity metrics should be
# published.
# Defaults to true.
#
# [*use_absolute_metrics*]
# (Optional) Flag indicating if absolute metrics should be published
# for interfaces.
@ -67,21 +72,22 @@
# Defaults to true.
#
class monasca::checks::ovs(
$admin_user = undef,
$admin_password = undef,
$admin_tenant_name = undef,
$cache_dir = '/dev/shm',
$check_router_ha = true,
$identity_uri = undef,
$included_interface_re = 'qg.*',
$metadata = [],
$network_use_bits = true,
$neutron_refresh = '14400',
$ovs_cmd = 'sudo /usr/bin/ovs-vsctl',
$region_name = undef,
$use_absolute_metrics = true,
$use_health_metrics = true,
$use_rate_metrics = true,
$admin_user = undef,
$admin_password = undef,
$admin_tenant_name = undef,
$cache_dir = '/dev/shm',
$check_router_ha = true,
$identity_uri = undef,
$included_interface_re = 'qg.*',
$metadata = [],
$network_use_bits = true,
$neutron_refresh = '14400',
$ovs_cmd = 'sudo /usr/bin/ovs-vsctl',
$publish_router_capacity = true,
$region_name = undef,
$use_absolute_metrics = true,
$use_health_metrics = true,
$use_rate_metrics = true,
){
$conf_dir = $::monasca::agent::conf_dir

1
spec/classes/monasca_checks_ovs_spec.rb
View File

@ -44,6 +44,7 @@ describe 'monasca::checks::ovs' do
is_expected.to contain_file(ovs_file).with_content(/^\s*use_absolute_metrics: true$/)
is_expected.to contain_file(ovs_file).with_content(/^\s*use_rate_metrics: true$/)
is_expected.to contain_file(ovs_file).with_content(/^\s*use_health_metrics: true$/)
is_expected.to contain_file(ovs_file).with_content(/^\s*publish_router_capacity: true$/)
end
end
end

1
templates/checks/ovs.yaml.erb
View File

@ -19,6 +19,7 @@ init_config:
use_absolute_metrics: <%= @use_absolute_metrics %>
use_rate_metrics: <%= @use_rate_metrics %>
use_health_metrics: <%= @use_health_metrics %>
publish_router_capacity: <%= @publish_router_capacity %>
instances:
- {}