Merge "Disable network validation in multinode jobs" into stable/ocata
This commit is contained in:
commit
9aee30a7aa
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: pike
|
||||
heat_template_version: ocata
|
||||
|
||||
description: >
|
||||
Software Config to drive validations that occur on all nodes.
|
||||
|
|
|
@ -10,6 +10,9 @@ resource_registry:
|
|||
OS::TripleO::Tasks::ControllerPreConfig: ../../extraconfig/tasks/pre_puppet_pacemaker.yaml
|
||||
OS::TripleO::Tasks::ControllerPostConfig: ../../extraconfig/tasks/post_puppet_pacemaker.yaml
|
||||
OS::TripleO::Tasks::ControllerPostPuppetRestart: ../../extraconfig/tasks/post_puppet_pacemaker_restart.yaml
|
||||
# Some infra instances don't pass the ping test but are otherwise working.
|
||||
# Since the OVB jobs also test this functionality we can shut it off here.
|
||||
OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml
|
||||
|
||||
parameter_defaults:
|
||||
ControllerServices:
|
||||
|
|
|
@ -19,6 +19,9 @@ resource_registry:
|
|||
OS::TripleO::Tasks::ControllerPreConfig: ../../extraconfig/tasks/pre_puppet_pacemaker.yaml
|
||||
OS::TripleO::Tasks::ControllerPostConfig: ../../extraconfig/tasks/post_puppet_pacemaker.yaml
|
||||
OS::TripleO::Tasks::ControllerPostPuppetRestart: ../../extraconfig/tasks/post_puppet_pacemaker_restart.yaml
|
||||
# Some infra instances don't pass the ping test but are otherwise working.
|
||||
# Since the OVB jobs also test this functionality we can shut it off here.
|
||||
OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml
|
||||
|
||||
parameter_defaults:
|
||||
ControllerServices:
|
||||
|
|
|
@ -14,6 +14,9 @@ resource_registry:
|
|||
OS::TripleO::Tasks::ControllerPreConfig: ../../extraconfig/tasks/pre_puppet_pacemaker.yaml
|
||||
OS::TripleO::Tasks::ControllerPostConfig: ../../extraconfig/tasks/post_puppet_pacemaker.yaml
|
||||
OS::TripleO::Tasks::ControllerPostPuppetRestart: ../../extraconfig/tasks/post_puppet_pacemaker_restart.yaml
|
||||
# Some infra instances don't pass the ping test but are otherwise working.
|
||||
# Since the OVB jobs also test this functionality we can shut it off here.
|
||||
OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml
|
||||
|
||||
parameter_defaults:
|
||||
ControllerServices:
|
||||
|
|
|
@ -14,6 +14,9 @@ resource_registry:
|
|||
OS::TripleO::Tasks::ControllerPreConfig: ../../extraconfig/tasks/pre_puppet_pacemaker.yaml
|
||||
OS::TripleO::Tasks::ControllerPostConfig: ../../extraconfig/tasks/post_puppet_pacemaker.yaml
|
||||
OS::TripleO::Tasks::ControllerPostPuppetRestart: ../../extraconfig/tasks/post_puppet_pacemaker_restart.yaml
|
||||
# Some infra instances don't pass the ping test but are otherwise working.
|
||||
# Since the OVB jobs also test this functionality we can shut it off here.
|
||||
OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml
|
||||
|
||||
parameter_defaults:
|
||||
ControllerServices:
|
||||
|
|
|
@ -21,6 +21,9 @@ resource_registry:
|
|||
OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
|
||||
OS::TripleO::Services::MySQL: ../../puppet/services/pacemaker/database/mysql.yaml
|
||||
OS::TripleO::Services::Keepalived: OS::Heat::None
|
||||
# Some infra instances don't pass the ping test but are otherwise working.
|
||||
# Since the OVB jobs also test this functionality we can shut it off here.
|
||||
OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml
|
||||
|
||||
|
||||
parameter_defaults:
|
||||
|
|
Loading…
Reference in New Issue