Merge "Fixes: Openstack HA SM: EVIP is not set in cmon_param during p…

…rovisioning"
Juniper · May 28, 2015 · a133e9e · a133e9e
2 parents a9d252b + 8706784
commit a133e9e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -4,4 +4,5 @@
 VIP="$__internal_vip__"
 DIPS=($__haproxy_dips__)
 DIPS_SIZE=${#DIPS[@]}
+EVIP="$__external_vip__"
 """)