Merge "Fix propagation of new Zabbix VIP changes to astute.yaml"

deployment_scripts/puppet/manifests/override_configuration.pp

@@ -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',
+}
+

deployment_scripts/puppet/modules/plugin_zabbix/templates/config_override.erb

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

deployment_tasks.yaml

@@ -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