Author: swagle
Date: Fri Jun 14 17:23:26 2013
New Revision: 1493168
URL: http://svn.apache.org/r1493168
Log:
AMBARI-2392. ambari-server setup -s fails. (swagle)
Modified:
incubator/ambari/trunk/ambari-server/src/main/python/ambari-server.py
Modified: incubator/ambari/trunk/ambari-server/src/main/python/ambari-server.py
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/python/ambari-server.py?rev=1493168&r1=1493167&r2=1493168&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/python/ambari-server.py
(original)
+++ incubator/ambari/trunk/ambari-server/src/main/python/ambari-server.py Fri
Jun 14 17:23:26 2013
@@ -947,21 +947,21 @@ def store_remote_properties(args):
properties.process_pair(JDBC_URL_PROPERTY,
DATABASE_CONNECTION_STRINGS[DATABASE_INDEX].format(jdbc_hostname,
args.database_port, args.database_name))
properties.process_pair(JDBC_USER_NAME_PROPERTY, args.database_username)
- if not args.database_password_alias:
+ if hasattr(args, 'database_password_alias') and args.database_password_alias:
+ properties.process_pair(JDBC_PASSWORD_PROPERTY,
args.database_password_alias)
+ else:
properties.process_pair(JDBC_PASSWORD_PROPERTY,
store_password_file(args.database_password, JDBC_PASSWORD_FILENAME))
- else:
- properties.process_pair(JDBC_PASSWORD_PROPERTY,
args.database_password_alias)
properties.process_pair(JDBC_RCA_DRIVER_PROPERTY,
DATABASE_DRIVER_NAMES[DATABASE_INDEX])
properties.process_pair(JDBC_RCA_URL_PROPERTY,
DATABASE_CONNECTION_STRINGS[DATABASE_INDEX].format(jdbc_hostname,
args.database_port, args.database_name))
properties.process_pair(JDBC_RCA_USER_NAME_PROPERTY, args.database_username)
- if not args.database_password_alias:
+ if hasattr(args, 'database_password_alias') and args.database_password_alias:
properties.process_pair(JDBC_RCA_PASSWORD_FILE_PROPERTY,
- store_password_file(args.database_password, JDBC_PASSWORD_FILENAME))
+ args.database_password_alias)
else:
properties.process_pair(JDBC_RCA_PASSWORD_FILE_PROPERTY,
- args.database_password_alias)
+ store_password_file(args.database_password, JDBC_PASSWORD_FILENAME))
conf_file = properties.fileName
@@ -1133,12 +1133,12 @@ def store_local_properties(args):
properties.removeOldProp(JDBC_DATABASE_PROPERTY)
properties.process_pair(PERSISTENCE_TYPE_PROPERTY, "local")
properties.process_pair(JDBC_USER_NAME_PROPERTY, args.database_username)
- if not args.database_password_alias:
+ if hasattr(args, 'database_password_alias') and args.database_password_alias:
properties.process_pair(JDBC_PASSWORD_PROPERTY,
- store_password_file(args.database_password, JDBC_PASSWORD_FILENAME))
+ args.database_password_alias)
else:
properties.process_pair(JDBC_PASSWORD_PROPERTY,
- args.database_password_alias)
+ store_password_file(args.database_password, JDBC_PASSWORD_FILENAME))
conf_file = properties.fileName
