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

Migration from group to colocation 

Closes-Bug: #1506767
Change-Id: I360fa25e2e3667f6376c0b098156cfa0559d891c
This commit is contained in:
Maciej Relewicz 2015-10-19 14:20:35 +02:00
parent ce0169b252
commit 3904744783
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deployment_scripts/puppet/modules/plugin_zabbix/manifests/primary_controller.pp
View File

@ -36,7 +36,7 @@ class plugin_zabbix::primary_controller {
}
cs_resource { "p_${plugin_zabbix::params::server_service}":
before => Cs_group["group__${plugin_zabbix::params::server_service}"],
before => Cs_rsc_colocation['vip-with-zabbix'],
primitive_class => 'ocf',
provided_by => $plugin_zabbix::params::ocf_scripts_provider,
primitive_type => $plugin_zabbix::params::server_service,
@ -50,11 +50,13 @@ class plugin_zabbix::primary_controller {
},
}
cs_group { "group__${plugin_zabbix::params::server_service}":
cs_rsc_colocation { 'vip-with-zabbix':
ensure => present,
score => 'INFINITY',
primitives => ["vip__${plugin_zabbix::params::vip_name}", "p_${plugin_zabbix::params::server_service}"],
}
File[$plugin_zabbix::params::server_config] -> File['zabbix-server-ocf'] -> Cs_resource["p_${plugin_zabbix::params::server_service}"]
Service["${plugin_zabbix::params::server_service}-init-stopped"] -> Cs_resource["p_${plugin_zabbix::params::server_service}"]
Cs_group["group__${plugin_zabbix::params::server_service}"] -> Service["${plugin_zabbix::params::server_service}-started"]
Cs_rsc_colocation['vip-with-zabbix'] -> Service["${plugin_zabbix::params::server_service}-started"]
}