summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Misiak <pmisiak@mirantis.com>2015-07-31 16:38:54 +0200
committerPiotr Misiak <pmisiak@mirantis.com>2015-08-03 10:03:02 +0200
commitfaa85abf8fa7f9a77e990bcfdd0dd14e49ca552d (patch)
treea7e4ac7d632e4d5974a0be6b7949d974df0a98b5
parent4e73ec9f295407e2835d2812e8dffea0fbc26a18 (diff)
Add an additional host group and fix issue with snmptt restarting
Notes
Notes (review): Verified+2: Jenkins Code-Review+1: Bartosz Kupidura <bkupidura@mirantis.com> Workflow+1: Bartosz Kupidura <bkupidura@mirantis.com> Code-Review+2: Szymon Banka <sbanka@mirantis.com> Workflow+1: Szymon Banka <sbanka@mirantis.com> Code-Review+1: Piotr Misiak <pmisiak@mirantis.com> Workflow+1: Piotr Misiak <pmisiak@mirantis.com> Code-Review+1: Dmitry Kalashnik <dkalashnik@mirantis.com> Submitted-by: Jenkins Submitted-at: Tue, 04 Aug 2015 08:49:59 +0000 Reviewed-on: https://review.openstack.org/207935 Project: stackforge/fuel-plugin-zabbix-monitoring-emc Branch: refs/heads/master
-rw-r--r--deployment_scripts/puppet/modules/plugin_zabbix_monitoring_emc/manifests/emc_host.pp2
-rw-r--r--deployment_scripts/puppet/modules/plugin_zabbix_monitoring_emc/manifests/init.pp2
-rw-r--r--deployment_scripts/puppet/modules/plugin_zabbix_monitoring_emc/manifests/snmptt_config.pp1
3 files changed, 3 insertions, 2 deletions
diff --git a/deployment_scripts/puppet/modules/plugin_zabbix_monitoring_emc/manifests/emc_host.pp b/deployment_scripts/puppet/modules/plugin_zabbix_monitoring_emc/manifests/emc_host.pp
index 6590428..0c64fe5 100644
--- a/deployment_scripts/puppet/modules/plugin_zabbix_monitoring_emc/manifests/emc_host.pp
+++ b/deployment_scripts/puppet/modules/plugin_zabbix_monitoring_emc/manifests/emc_host.pp
@@ -14,7 +14,7 @@
14# under the License. 14# under the License.
15# 15#
16define plugin_zabbix_monitoring_emc::emc_host( 16define plugin_zabbix_monitoring_emc::emc_host(
17 $host_group = 'EMC', 17 $host_group = ['EMC', 'Hardware'],
18) { 18) {
19 19
20 $host = split($name,':') 20 $host = split($name,':')
diff --git a/deployment_scripts/puppet/modules/plugin_zabbix_monitoring_emc/manifests/init.pp b/deployment_scripts/puppet/modules/plugin_zabbix_monitoring_emc/manifests/init.pp
index c320e22..37aa4f6 100644
--- a/deployment_scripts/puppet/modules/plugin_zabbix_monitoring_emc/manifests/init.pp
+++ b/deployment_scripts/puppet/modules/plugin_zabbix_monitoring_emc/manifests/init.pp
@@ -14,7 +14,7 @@
14# under the License. 14# under the License.
15# 15#
16class plugin_zabbix_monitoring_emc( 16class plugin_zabbix_monitoring_emc(
17 $host_group = 'EMC', 17 $host_group = ['EMC','Hardware'],
18) 18)
19{ 19{
20 20
diff --git a/deployment_scripts/puppet/modules/plugin_zabbix_monitoring_emc/manifests/snmptt_config.pp b/deployment_scripts/puppet/modules/plugin_zabbix_monitoring_emc/manifests/snmptt_config.pp
index 5a6ac09..fd47320 100644
--- a/deployment_scripts/puppet/modules/plugin_zabbix_monitoring_emc/manifests/snmptt_config.pp
+++ b/deployment_scripts/puppet/modules/plugin_zabbix_monitoring_emc/manifests/snmptt_config.pp
@@ -42,6 +42,7 @@ class plugin_zabbix_monitoring_emc::snmptt_config {
42 service { 'snmptt': 42 service { 'snmptt':
43 ensure => running, 43 ensure => running,
44 enable => true, 44 enable => true,
45 hasstatus => false,
45 } 46 }
46 47
47} 48}