Updated Branches: refs/heads/trunk 5bf2ec587 -> 63ce1d475
AMBARI-2598. Cleanup setup text. (Jeff Sposetti via 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/63ce1d47 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/63ce1d47 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/63ce1d47 Branch: refs/heads/trunk Commit: 63ce1d475a67ff7602688b356b7c4d97e52e5c18 Parents: 5bf2ec5 Author: Mahadev Konar <[email protected]> Authored: Wed Jul 10 17:21:19 2013 -0700 Committer: Mahadev Konar <[email protected]> Committed: Wed Jul 10 17:21:19 2013 -0700 ---------------------------------------------------------------------- ambari-server/src/main/python/ambari-server.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/63ce1d47/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 47fe3f2..30d639c 100755 --- a/ambari-server/src/main/python/ambari-server.py +++ b/ambari-server/src/main/python/ambari-server.py @@ -287,7 +287,7 @@ MYSQL_EXEC_ARGS = "--host={0} --port={1} --user={2} --password={3} {4} " \ JDBC_PATTERNS = {"oracle":"*ojdbc*.jar", "mysql":"*mysql*.jar"} DATABASE_FULL_NAMES = {"oracle":"Oracle", "mysql":"MySQL", "postgres":"PostgreSQL"} -ORACLE_DB_ID_TYPES = ["Service Name", "Service ID"] +ORACLE_DB_ID_TYPES = ["Service Name", "SID"] # jdk commands @@ -1029,7 +1029,7 @@ def prompt_db_properties(args): database_num = str(DATABASE_INDEX + 1) database_num = get_validated_string_input( - "Select database:\n1 - Postgres(Embedded)\n2 - Oracle\n[" + database_num + "]:", + "Select database:\n1 - PostgreSQL (Embedded)\n2 - Oracle\n[" + database_num + "]:", database_num, "^[12]$", "Invalid number.", @@ -1061,7 +1061,7 @@ def prompt_db_properties(args): # Oracle uses service name or service id idType = "1" idType = get_validated_string_input( - "Select type of id to use:\n1 - " + ORACLE_DB_ID_TYPES[0] + + "Select Oracle identifier type:\n1 - " + ORACLE_DB_ID_TYPES[0] + "\n2 - " + ORACLE_DB_ID_TYPES[1] + "\n[" + idType + "]:", idType, "^[12]$",
