provitioning multiple zookeeper 4 snmp & topology

Build 2697: On multi node setup, when zookeeper on one of the db nodes goes down, contrail-topology/snmp collector not able to connect to remote zookeeper Closes-Bug: 1533597 Change-Id: I8045ee5aacbf4579d027baf2c0603a1f97b8b72c
Juniper · Jan 15, 2016 · d31d409 · d31d409
1 parent 4071fb7
commit d31d409
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/contrail_provisioning/collector/setup.py b/contrail_provisioning/collector/setup.py
@@ -157,7 +157,7 @@ def fixup_contrail_snmp_collector(self):
             local("echo 'mibs +ALL' > /etc/snmp/snmp.conf")
             local("[ -f %s ] || > %s" % (conf_fl, conf_fl))
         self.set_config(conf_fl, 'DEFAULTS', 'zookeeper',
-                        self.cassandra_server_list[0][0] + ':2181')
+            ','.join('%s:2181' % cs[0] for cs in self.cassandra_server_list))
         self.set_config(conf_fl, 'DISCOVERY', 'disc_server_ip',
                         self._args.cfgm_ip)
         self.set_config(conf_fl, 'DISCOVERY', 'disc_server_port', '5998')
@@ -182,7 +182,7 @@ def fixup_contrail_topology(self):
         with settings(warn_only=True):
             local("[ -f %s ] || > %s" % (conf_fl, conf_fl))
         self.set_config(conf_fl, 'DEFAULTS', 'zookeeper',
-                        self.cassandra_server_list[0][0] + ':2181')
+            ','.join('%s:2181' % cs[0] for cs in self.cassandra_server_list))
         self.set_config('/etc/contrail/supervisord_analytics_files/' +\
                         'contrail-topology.ini',
                         'program:contrail-topology',