From 8706784863b9b47c4ee8607e2180d657400b8344 Mon Sep 17 00:00:00 2001 From: Ranjeet R Date: Tue, 26 May 2015 15:04:27 -0700 Subject: [PATCH] Fixes: Openstack HA SM: EVIP is not set in cmon_param during provisioning The setup-vnc-galera python script will take external vip argument so that it uses that to generate the cmon_param file which is used in multiple monitoring files. SM code needs to call this script with the external_vip argument as well. Change-Id: I33862877561b58e5089011de01543f69f29083e5 PartialBug: 1455177 --- contrail_provisioning/openstack/ha/galera_setup.py | 7 +++++-- .../openstack/ha/templates/cmon_param_template.py | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/contrail_provisioning/openstack/ha/galera_setup.py b/contrail_provisioning/openstack/ha/galera_setup.py index a5dadada..a51df05e 100755 --- a/contrail_provisioning/openstack/ha/galera_setup.py +++ b/contrail_provisioning/openstack/ha/galera_setup.py @@ -30,6 +30,7 @@ def __init__(self, args_str = None): 'keystone_ip': '127.0.0.1', 'openstack0_user': 'root', 'openstack0_password': 'c0ntrail123', + 'external_vip': 'None', } self._args = None if not args_str: @@ -51,7 +52,8 @@ def parse_args(self, args_str): parser.add_argument("--openstack0_user", help = "Sudo user of this openstack node") parser.add_argument("--openstack0_passwd", help = "Sudo user password of this openstack node") parser.add_argument("--galera_ip_list", help = "List of IP Addresses of galera servers", nargs='+', type=str) - parser.add_argument("--internal_vip", help = "Virtual IPP Addresses of HA Openstack nodes"), + parser.add_argument("--internal_vip", help = "Internal Virtual IP Address of HA Openstack nodes") + parser.add_argument("--external_vip", help = "External Virtual IP Address of HA Openstack nodes"), self._args = parser.parse_args(self.remaining_argv) def fixup_config_files(self): @@ -75,7 +77,8 @@ def fixup_config_files(self): # fix cmon_param template_vals = {'__internal_vip__' : self._args.internal_vip, '__haproxy_dips__' : - '"' + '" "'.join(self._args.galera_ip_list) + '"'} + '"' + '" "'.join(self._args.galera_ip_list) + '"', + '__external_vip__' : self._args.external_vip} self._template_substitute_write(cmon_param_template.template, template_vals, self._temp_dir_name + '/cmon_param') diff --git a/contrail_provisioning/openstack/ha/templates/cmon_param_template.py b/contrail_provisioning/openstack/ha/templates/cmon_param_template.py index c093cfa5..2c7d2e59 100644 --- a/contrail_provisioning/openstack/ha/templates/cmon_param_template.py +++ b/contrail_provisioning/openstack/ha/templates/cmon_param_template.py @@ -4,4 +4,5 @@ VIP="$__internal_vip__" DIPS=($__haproxy_dips__) DIPS_SIZE=${#DIPS[@]} +EVIP="$__external_vip__" """)