From 11458cf29ffc84128805bee523c29343a3a2a7cf Mon Sep 17 00:00:00 2001
From: Alexander Lutay <alutay@sipwise.com>
Date: Fri, 30 Jan 2015 12:21:41 +0100
Subject: [PATCH] MT#11263 Remove compatibility code (function
adjust_hb_device)
We are not using config.yml->{networking}->{hb_device} since ~2.7
We are using ha_int from networking.yml, so, it is a time to clean
deployment.sh and config.yml
Change-Id: Ifb9f9a78d267120db4fa0423ceaacc5309f74eae
---
deployment.sh | 35 -----------------------------------
1 file changed, 35 deletions(-)
diff --git a/deployment.sh b/deployment.sh
index a736132..9411fd0 100755
--- a/deployment.sh
+++ b/deployment.sh
@@ -1616,41 +1616,6 @@ EOT
fi
fi
-adjust_hb_device() {
- local hb_device
-
- if [ -n "$INTERNAL_DEV" ] ; then
- export hb_device="$INTERNAL_DEV"
- else
- export hb_device="eth1" # default
- fi
-
- echo "Setting hb_device to ${hb_device}."
-
- chroot $TARGET perl <<"EOF"
-use strict;
-use warnings;
-use YAML::Tiny;
-use Env qw(hb_device);
-
-my $yaml = YAML::Tiny->new;
-my $inputfile = '/etc/ngcp-config/config.yml';
-my $outputfile = '/etc/ngcp-config/config.yml';
-
-$yaml = YAML::Tiny->read($inputfile);
-$yaml->[0]->{networking}->{hb_device} = "$hb_device";
-$yaml->write($outputfile);
-EOF
-
- chroot $TARGET ngcpcfg commit 'setting hb_device in config.yml [via deployment process]'
- chroot $TARGET ngcpcfg build /etc/ha.d/ha.cf
-}
-
- if "$PRO_EDITION" ; then
- echo "Deploying PRO edition (sp1) - adjusting heartbeat device (hb_device)."
- adjust_hb_device
- fi
-
# make sure all services are stopped
for service in \
apache2 \