From 83969653ab715c18d58670b75b7a14e9610a729a Mon Sep 17 00:00:00 2001
From: Olivier Bourdon <obourdon@mirantis.com>
Date: Wed, 24 May 2017 06:29:52 +0200
Subject: [PATCH] Fix propagation of new Zabbix VIP changes to astute.yaml

Closes-Bug: #1691157

Change-Id: Ie56ed4f372b18c85c8257b1b8c473519a4ca2c04
---
 .../puppet/manifests/override_configuration.pp       | 10 ++++++++++
 .../plugin_zabbix/templates/config_override.erb      |  5 +++++
 deployment_tasks.yaml                                | 12 ++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 deployment_scripts/puppet/manifests/override_configuration.pp
 create mode 100644 deployment_scripts/puppet/modules/plugin_zabbix/templates/config_override.erb

diff --git a/deployment_scripts/puppet/manifests/override_configuration.pp b/deployment_scripts/puppet/manifests/override_configuration.pp
new file mode 100644
index 0000000..fdc159e
--- /dev/null
+++ b/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',
+}
+
diff --git a/deployment_scripts/puppet/modules/plugin_zabbix/templates/config_override.erb b/deployment_scripts/puppet/modules/plugin_zabbix/templates/config_override.erb
new file mode 100644
index 0000000..a46a62d
--- /dev/null
+++ b/deployment_scripts/puppet/modules/plugin_zabbix/templates/config_override.erb
@@ -0,0 +1,5 @@
+---
+network_metadata:
+  vips:
+    zbx_vip_mgmt:
+      namespace: zabbix
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index fc69516..585de79 100644
--- a/deployment_tasks.yaml
+++ b/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