Fix propagation of new Zabbix VIP changes to astute.yaml

Closes-Bug: #1691157

Change-Id: Ie56ed4f372b18c85c8257b1b8c473519a4ca2c04
This commit is contained in:
Olivier Bourdon 2017-05-24 06:29:52 +02:00
parent 846e166406
commit 83969653ab
3 changed files with 27 additions and 0 deletions

View File

@ -0,0 +1,10 @@
notice('zabbix_monitoring/override_configuration')
file { '/etc/hiera/plugins/zabbix_monitoring.yaml':
ensure => present,
content => template('plugin_zabbix/config_override.erb'),
owner => root,
group => root,
mode => '0644',
}

View File

@ -0,0 +1,5 @@
---
network_metadata:
vips:
zbx_vip_mgmt:
namespace: zabbix

View File

@ -100,3 +100,15 @@
timeout: 300
reexecute_on:
- deploy_changes
- id: zbx-override-configuration
type: puppet
version: 2.0.0
# Zabbix deployment start at post_deploy stage only
requires: [upload_configuration]
required_for: [globals]
role: '*'
parameters:
puppet_manifest: puppet/manifests/override_configuration.pp
puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 120