Merge "Using cassandra authentication in discovery"

Juniper · May 3, 2016 · 2b91358 · 2b91358
2 parents 2968ee8 + b2ff13f
commit 2b91358
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/discovery/disc_cassdb.py b/src/discovery/disc_cassdb.py
@@ -30,7 +30,9 @@ def get_db_info(cls):
         return db_info
     # end get_db_info
 
-    def __init__(self, module, cass_srv_list, config_log, reset_config=False, db_prefix=None):
+    def __init__(self, module, cass_srv_list, config_log, reset_config=False,
+	    db_prefix=None, cass_credential=None):
+
         self._debug = {
             'db_upd_oper_state': 0,
             'db_upd_admin_state': 0,
@@ -44,7 +46,7 @@ def __init__(self, module, cass_srv_list, config_log, reset_config=False, db_pre
 
         super(DiscoveryCassandraClient, self).__init__(
             cass_srv_list, db_prefix, keyspaces, None,
-            config_log, reset_config=reset_config)
+            config_log, reset_config=reset_config, credential=cass_credential)
 
         DiscoveryCassandraClient._disco_cf = self._cf_dict[self._DISCOVERY_CF_NAME]
     #end __init__

diff --git a/src/discovery/disc_server.py b/src/discovery/disc_server.py
@@ -335,9 +335,14 @@ def get_service_config(self, service_type, item):
     # end
 
     def _db_connect(self, reset_config):
+        cred = None
+        if 'cassandra' in self.cassandra_config.keys():
+            cred = {'username':self.cassandra_config['cassandra']\
+                    ['cassandra_user'],'password':self.cassandra_config\
+                    ['cassandra']['cassandra_password']}
         self._db_conn = DiscoveryCassandraClient("discovery",
             self._args.cassandra_server_list, self.config_log, reset_config,
-            self._args.cluster_id)
+            self._args.cluster_id, cred)
     # end _db_connect
 
     def cleanup(self):