From 62835ea6a5142a9c1eb4daf6bdd4ffb69cc4aaa7 Mon Sep 17 00:00:00 2001
From: Ranjeet R <rranjeet@juniper.net>
Date: Fri, 8 May 2015 16:22:14 -0700
Subject: [PATCH] Fixes:Openstack HA , EVIP user parameter is not set after
 upgrade from 2.11 to 2.20

Adding EVIP parameter which was introduced in 2.2 for the
parameters passed to the cmon monitor script. Adding the parameter
in the upgrade path as well.

Change-Id: I6ffb1f4046a42cc8957532b501c369ec1ffd1c8d
ClosesBug: 1452483
---
 contrail_provisioning/openstack/upgrade.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/contrail_provisioning/openstack/upgrade.py b/contrail_provisioning/openstack/upgrade.py
index 564764ae..eb83ec16 100644
--- a/contrail_provisioning/openstack/upgrade.py
+++ b/contrail_provisioning/openstack/upgrade.py
@@ -53,6 +53,10 @@ def fix_cmon_config(self):
             local("mysql -uroot -p$(cat /etc/contrail/mysql.token) -e 'drop database cmon'")
             local("sed -i '/pidfile=\/var\/run\//c\pidfile=\/var\/run\/cmon\/' /etc/cmon.cnf")
 
+    def fix_cmon_param_file(self):
+        with settings(warn_only=True):
+            local("sed -i '$ a\EVIP=%s' /etc/contrail/ha/cmon_param" % self._args.external_vip)
+
     def upgrade(self):
         self.stop()
         self._upgrade()
@@ -68,6 +72,8 @@ def upgrade(self):
             self._args.from_rel < 2.2 and
             self._args.to_rel >= 2.2):
             self.fix_cmon_config()
+            self.fix_cmon_param_file()
+
         self.restart()