Browse Source

Fix issue where VIP becomes unavailable after Controller reboot

Use a dedicated network namespace (zabbix) for the Zabbix VIP

Change-Id: I70486093cb2c1009fd6a8602c5cebadeb1c3e6f6
Closes-Bug: #1644821
Olivier Bourdon 2 years ago
parent
commit
ca610036b2

+ 1
- 1
deployment_scripts/puppet/modules/plugin_zabbix/files/zabbix-server.ocf View File

@@ -45,7 +45,7 @@ SERVICE_NAME="Zabbix-server"
45 45
 
46 46
 OCF_RESKEY_binary_default="/usr/sbin/zabbix_server"
47 47
 OCF_RESKEY_pid_default="/var/run/zabbix/zabbix_server.pid"
48
-OCF_RESKEY_namespace_default="haproxy"
48
+OCF_RESKEY_namespace_default="zabbix"
49 49
 
50 50
 : ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}}
51 51
 : ${OCF_RESKEY_pid=${OCF_RESKEY_pid_default}}

+ 3
- 2
deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp View File

@@ -116,6 +116,7 @@ class plugin_zabbix::params {
116 116
   #server parameters
117 117
   $vip_name                          = 'zbx_vip_mgmt'
118 118
   $server_ip                         = $network_metadata['vips'][$vip_name]['ipaddr']
119
+  $server_public_ip                  = $network_metadata['vips']['public']['ipaddr']
119 120
   $mgmt_vip                          = $network_metadata['vips']['management']['ipaddr']
120 121
   $server_config                     = "${zabbix_base_conf_dir}/zabbix_server.conf"
121 122
   $server_config_template            = 'plugin_zabbix/zabbix_server.conf.erb'
@@ -174,9 +175,9 @@ class plugin_zabbix::params {
174 175
 
175 176
   #api
176 177
   if $ssl[horizon] == true {
177
-    $api_url = "https://${server_ip}${frontend_base}/api_jsonrpc.php"
178
+    $api_url = "https://${server_public_ip}${frontend_base}/api_jsonrpc.php"
178 179
   }else{
179
-    $api_url = "http://${server_ip}${frontend_base}/api_jsonrpc.php"
180
+    $api_url = "http://${server_public_ip}${frontend_base}/api_jsonrpc.php"
180 181
   }
181 182
 
182 183
   $api_hash = { endpoint => $api_url,

+ 1
- 1
network_roles.yaml View File

@@ -5,4 +5,4 @@
5 5
     gateway: false
6 6
     vip:
7 7
       - name: "zbx_vip_mgmt"
8
-        namespace: "haproxy"
8
+        namespace: "zabbix"

Loading…
Cancel
Save