Merge "Various clean up in API server/schema transformer" into R2.20

Juniper · May 28, 2015 · 81b1966 · 81b1966
2 parents eea6720 + 5809ca1
commit 81b1966
Show file tree

Hide file tree

Showing 3 changed files with 110 additions and 303 deletions.
diff --git a/src/config/api-server/vnc_cfg_api_server.py b/src/config/api-server/vnc_cfg_api_server.py
@@ -936,7 +936,6 @@ def _db_connect(self, reset_config):
         cass_server_list = self._args.cassandra_server_list
         redis_server_ip = self._args.redis_server_ip
         redis_server_port = self._args.redis_server_port
-        ifmap_loc = self._args.ifmap_server_loc
         zk_server = self._args.zk_server_ip
         rabbit_servers = self._args.rabbit_server
         rabbit_port = self._args.rabbit_port
@@ -948,7 +947,7 @@ def _db_connect(self, reset_config):
         db_conn = VncDbClient(self, ifmap_ip, ifmap_port, user, passwd,
                               cass_server_list, rabbit_servers, rabbit_port,
                               rabbit_user, rabbit_password, rabbit_vhost,
-                              rabbit_ha_mode, reset_config, ifmap_loc,
+                              rabbit_ha_mode, reset_config,
                               zk_server, self._args.cluster_id)
         self._db_conn = db_conn
     # end _db_connect