Browse Source

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

Jenkins 1 year ago
parent
commit
6fa6a8f811

+ 10
- 0
deployment_scripts/puppet/manifests/override_configuration.pp View File

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

+ 5
- 0
deployment_scripts/puppet/modules/plugin_zabbix/templates/config_override.erb View File

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

+ 12
- 0
deployment_tasks.yaml View File

@@ -100,3 +100,15 @@
100 100
     timeout: 300
101 101
   reexecute_on:
102 102
     - deploy_changes
103
+
104
+- id: zbx-override-configuration
105
+  type: puppet
106
+  version: 2.0.0
107
+  # Zabbix deployment start at post_deploy stage only
108
+  requires: [upload_configuration]
109
+  required_for: [globals]
110
+  role: '*'
111
+  parameters:
112
+    puppet_manifest: puppet/manifests/override_configuration.pp
113
+    puppet_modules: puppet/modules:/etc/puppet/modules
114
+    timeout: 120

Loading…
Cancel
Save