summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFedor Zhadaev <fzhadaev@mirantis.com>2016-11-02 10:07:28 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-02 10:07:28 +0000
commitc11337074cfa0d520fb3fa876965e420fd7145e3 (patch)
tree4aa8b51190a9729e1cb492ea3a6748b93cf727fd
parent60f0e3feb54726f0ba520f6e1e666b6bbf743c45 (diff)
parentfe27f4c50aa54c9db6736722e8cf057af83c74be (diff)
Merge "Revert "Disable public ping_checker resource by default"" into stable/colorado
-rwxr-xr-xbuild/patch-repos/build/repos/fuel-library/0004-Disable-public-ping_checker-resource-by-default.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/build/patch-repos/build/repos/fuel-library/0004-Disable-public-ping_checker-resource-by-default.patch b/build/patch-repos/build/repos/fuel-library/0004-Disable-public-ping_checker-resource-by-default.patch
deleted file mode 100755
index e2b41e52f..000000000
--- a/build/patch-repos/build/repos/fuel-library/0004-Disable-public-ping_checker-resource-by-default.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From dbf7e56888a6b2ad09118a267d3edbf55f259c8f Mon Sep 17 00:00:00 2001
-From: Michael Polenchuk <mpolenchuk@mirantis.com>
-Date: Wed, 26 Oct 2016 15:26:11 +0300
-Subject: [PATCH] Disable public ping_checker resource by default
-
-Avoid public vip failover in the middle of deployment
-by disabling ping_checker resource by default.
-
-Change-Id: I666fbbbe98d000c66f97cf4751f304a2da9aad67
----
- .../manifests/virtual_ips/public_vip_ping.pp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deployment/puppet/osnailyfacter/manifests/virtual_ips/public_vip_ping.pp b/deployment/puppet/osnailyfacter/manifests/virtual_ips/public_vip_ping.pp
-index 49d9c42..c7f6cbd 100644
---- a/deployment/puppet/osnailyfacter/manifests/virtual_ips/public_vip_ping.pp
-+++ b/deployment/puppet/osnailyfacter/manifests/virtual_ips/public_vip_ping.pp
-@@ -4,7 +4,7 @@ class osnailyfacter::virtual_ips::public_vip_ping {
-
- $network_scheme = hiera_hash('network_scheme', {})
- prepare_network_config($network_scheme)
-- $run_ping_checker = hiera('run_ping_checker', true)
-+ $run_ping_checker = hiera('run_ping_checker', false)
- $public_iface = get_network_role_property('public/vip', 'interface')
- $ping_host_list = $network_scheme['endpoints'][$public_iface]['gateway']
-
---
-1.7.9.5
-