Merge branch 'mr/develop/dbmw' into 'master'

Mr/develop/dbmw

See merge request !12

data_sync/utils.py

@@ -189,5 +189,5 @@ def get_es_instance():
         'sniff_on_connection_fail': False,
     }
     new_hosts = settings.ES7_HOSTS
-    __es_instance = Elasticsearch(hosts=new_hosts, http_auth=("elastic", "gengmei!@#"), **init_args)
+    __es_instance = Elasticsearch(hosts=new_hosts, http_auth=(settings.HTTP_AUTH_NAME, settings.HTTP_AUTH_PWD), **init_args)
     return __es_instance

qa/models/toutiao.py

@@ -65,7 +65,7 @@ def get_es(es_hosts_config=None):
         'sniff_on_connection_fail': False,
     }
     new_hosts = settings.ES7_HOSTS if not es_hosts_config else es_hosts_config
-    new_es = Es(hosts=new_hosts, http_auth=("elastic", "gengmei!@#"),**init_args)
+    new_es = Es(hosts=new_hosts, http_auth=(settings.HTTP_AUTH_NAME, settings.HTTP_AUTH_PWD), **init_args)
     return new_es
 
 
@@ -75,8 +75,8 @@ def get_service_es(es_hosts_config=None):
         'sniff_on_connection_fail': False,
     }
 
-    new_hosts = settings.ES7_HOSTS_SERVICE if not es_hosts_config else es_hosts_config
-    new_es = Es(hosts=new_hosts, http_auth=("elastic", "gengmei!@#"), **init_args)
+    new_hosts = settings.ES7_SERVICE_HOSTS if not es_hosts_config else es_hosts_config
+    new_es = Es(hosts=new_hosts, http_auth=(settings.HTTP_AUTH_NAME, settings.HTTP_AUTH_PWD), **init_args)
     return new_es