You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ma...@apache.org on 2013/09/13 18:12:29 UTC
git commit: Revert "AMBARI-3222. server.jdbc.hostname should be
removed. (mahadev)"
Updated Branches:
refs/heads/trunk 6f7e5c582 -> 3356ffbd9
Revert "AMBARI-3222. server.jdbc.hostname should be removed. (mahadev)"
This reverts commit 78867493c9d9a15e260f49d5c339df9014e76c2d.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/3356ffbd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/3356ffbd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/3356ffbd
Branch: refs/heads/trunk
Commit: 3356ffbd99bc5eec5971b1b3e86b0a5e1221e68d
Parents: 6f7e5c5
Author: Mahadev Konar <ma...@apache.org>
Authored: Fri Sep 13 09:12:15 2013 -0700
Committer: Mahadev Konar <ma...@apache.org>
Committed: Fri Sep 13 09:12:15 2013 -0700
----------------------------------------------------------------------
ambari-server/src/main/python/ambari-server.py | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/3356ffbd/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 c6a1306..3069c89 100755
--- a/ambari-server/src/main/python/ambari-server.py
+++ b/ambari-server/src/main/python/ambari-server.py
@@ -237,6 +237,7 @@ 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"
@@ -259,6 +260,7 @@ 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"
@@ -1163,6 +1165,7 @@ 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)
@@ -1371,6 +1374,7 @@ 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)
@@ -1427,6 +1431,7 @@ 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