Merge "Split public_vip_ping task out"
This commit is contained in:
commit
598365a7d7
|
@ -41,16 +41,16 @@ define cluster::virtual_ip_ping (
|
|||
primitive => $vip_name,
|
||||
rules => [
|
||||
{
|
||||
'score' => '-inf',
|
||||
'score' => '50',
|
||||
'expressions' => [
|
||||
{
|
||||
'attribute' => "pingd",
|
||||
'operation' => 'not_defined',
|
||||
'operation' => 'defined',
|
||||
},
|
||||
{
|
||||
'attribute' => "pingd",
|
||||
'operation'=>'lte',
|
||||
'value' => '0',
|
||||
'operation' => 'gte',
|
||||
'value' => '1',
|
||||
},
|
||||
],
|
||||
},
|
||||
|
|
|
@ -122,14 +122,30 @@
|
|||
timeout: 180
|
||||
cwd: /
|
||||
|
||||
- id: public_vip_ping
|
||||
- id: primary_public_vip_ping
|
||||
type: puppet
|
||||
version: 2.1.0
|
||||
role: [primary-controller, controller]
|
||||
role: [primary-controller]
|
||||
requires: [post_deployment_start]
|
||||
required_for: [post_deployment_end]
|
||||
condition:
|
||||
yaql_exp: "changed($.network_scheme) or changed($.get('run_ping_checker'))"
|
||||
yaql_exp: &pub_viping "changed($.network_scheme) or changed($.get('run_ping_checker'))"
|
||||
parameters:
|
||||
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/virtual_ips/public_vip_ping.pp
|
||||
puppet_modules: /etc/puppet/modules
|
||||
timeout: 120
|
||||
cwd: /
|
||||
|
||||
- id: public_vip_ping
|
||||
type: puppet
|
||||
version: 2.1.0
|
||||
role: [controller]
|
||||
requires: [post_deployment_start]
|
||||
required_for: [post_deployment_end]
|
||||
condition:
|
||||
yaql_exp: *pub_viping
|
||||
cross-depends:
|
||||
- name: primary_public_vip_ping
|
||||
parameters:
|
||||
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/virtual_ips/public_vip_ping.pp
|
||||
puppet_modules: /etc/puppet/modules
|
||||
|
|
Loading…
Reference in New Issue