Updated Branches: refs/heads/trunk 344aa6417 -> 78867493c
AMBARI-3222. server.jdbc.hostname should be removed. (mahadev) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/78867493 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/78867493 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/78867493 Branch: refs/heads/trunk Commit: 78867493c9d9a15e260f49d5c339df9014e76c2d Parents: 344aa64 Author: Mahadev Konar <[email protected]> Authored: Thu Sep 12 18:31:24 2013 -0700 Committer: Mahadev Konar <[email protected]> Committed: Thu Sep 12 18:31:28 2013 -0700 ---------------------------------------------------------------------- ambari-server/src/main/python/ambari-server.py | 5 ----- 1 file changed, 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/78867493/ambari-server/src/main/python/ambari-server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/ambari-server.py b/ambari-server/src/main/python/ambari-server.py index f826c8e..0e6632b 100755 --- a/ambari-server/src/main/python/ambari-server.py +++ b/ambari-server/src/main/python/ambari-server.py @@ -240,7 +240,6 @@ PG_HBA_RELOAD_CMD = "su postgres --command='pg_ctl -D {0} reload'" PG_DEFAULT_PASSWORD = "bigdata" JDBC_DATABASE_PROPERTY = "server.jdbc.database" -JDBC_HOSTNAME_PROPERTY = "server.jdbc.hostname" JDBC_PORT_PROPERTY = "server.jdbc.port" JDBC_SCHEMA_PROPERTY = "server.jdbc.schema" @@ -263,7 +262,6 @@ JDBC_DRIVER_PROPERTY = "server.jdbc.driver" JDBC_URL_PROPERTY = "server.jdbc.url" JDBC_RCA_DATABASE_PROPERTY = "server.jdbc.database" -JDBC_RCA_HOSTNAME_PROPERTY = "server.jdbc.hostname" JDBC_RCA_PORT_PROPERTY = "server.jdbc.port" JDBC_RCA_SCHEMA_PROPERTY = "server.jdbc.schema" @@ -1178,7 +1176,6 @@ def store_remote_properties(args): properties.process_pair(PERSISTENCE_TYPE_PROPERTY, "remote") properties.process_pair(JDBC_DATABASE_PROPERTY, args.database) - properties.process_pair(JDBC_HOSTNAME_PROPERTY, args.database_host) properties.process_pair(JDBC_PORT_PROPERTY, args.database_port) properties.process_pair(JDBC_SCHEMA_PROPERTY, args.database_name) @@ -1387,7 +1384,6 @@ def store_local_properties(args): isSecure = get_is_secure(properties) properties.removeOldProp(JDBC_SCHEMA_PROPERTY) - properties.removeOldProp(JDBC_HOSTNAME_PROPERTY) properties.removeOldProp(JDBC_RCA_DRIVER_PROPERTY) properties.removeOldProp(JDBC_RCA_URL_PROPERTY) properties.removeOldProp(JDBC_PORT_PROPERTY) @@ -1444,7 +1440,6 @@ def parse_properties_file(args): if args.persistence_type == 'remote': args.database = properties[JDBC_DATABASE_PROPERTY] - args.database_host = properties[JDBC_HOSTNAME_PROPERTY] args.database_port = properties[JDBC_PORT_PROPERTY] args.database_name = properties[JDBC_SCHEMA_PROPERTY] global DATABASE_INDEX
