x
/
fuel-plugin-external-zabbix
Code Issues Proposed changes

Merge "Fix issue where VIP becomes unavailable after Controller reboot"

This commit is contained in:
Jenkins 2017-01-11 14:33:57 +00:00 committed by Gerrit Code Review
parent 45bcbdecb7 ca610036b2
commit c3edd51cfc
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

5
deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp
View File

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

2
network_roles.yaml
View File

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