Repository: ambari Updated Branches: refs/heads/trunk 179e5b29b -> 186db4e0c
AMBARI-5604. Postgres should be option 4 in setup, not 2. (swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/186db4e0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/186db4e0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/186db4e0 Branch: refs/heads/trunk Commit: 186db4e0cdc6ec9d4f4ca6176895acda36ef203b Parents: 179e5b2 Author: Siddharth Wagle <[email protected]> Authored: Mon Apr 28 16:30:02 2014 -0700 Committer: Siddharth Wagle <[email protected]> Committed: Mon Apr 28 16:30:02 2014 -0700 ---------------------------------------------------------------------- ambari-server/src/main/python/ambari-server.py | 16 +++++++++++++--- ambari-server/src/test/python/TestAmbariServer.py | 4 ++-- 2 files changed, 15 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/186db4e0/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 a3f5008..8840246 100755 --- a/ambari-server/src/main/python/ambari-server.py +++ b/ambari-server/src/main/python/ambari-server.py @@ -1185,7 +1185,7 @@ def prompt_db_properties(args): database_num = str(DATABASE_INDEX + 1) database_num = get_validated_string_input( - "[1] - PostgreSQL (Embedded)\n[2] - PostgreSQL (External)\n[3] - Oracle\n[4] - MySQL\n" + "[1] - PostgreSQL (Embedded)\n[2] - Oracle\n[3] - MySQL\n[4] - PostgreSQL (External)\n" "==============================================================================\n" "Enter choice (" + database_num + "): ", database_num, @@ -1200,8 +1200,18 @@ def prompt_db_properties(args): DATABASE_INDEX = 0 else: args.persistence_type = 'remote' - args.database_index = int(database_num) - 2 - DATABASE_INDEX = int(database_num) - 2 + selected_db_option = int(database_num) + + if selected_db_option == 2: + args.database_index = 1 + elif selected_db_option == 3: + args.database_index = 2 + elif selected_db_option == 4: + args.database_index = 0 + else: + print_info_msg('Unknown db option, default to embbeded postgres.') + args.database_index = 0 + pass args.dbms = DATABASE_NAMES[args.database_index] http://git-wip-us.apache.org/repos/asf/ambari/blob/186db4e0/ambari-server/src/test/python/TestAmbariServer.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/TestAmbariServer.py b/ambari-server/src/test/python/TestAmbariServer.py index 3568fd2..be3c64a 100644 --- a/ambari-server/src/test/python/TestAmbariServer.py +++ b/ambari-server/src/test/python/TestAmbariServer.py @@ -2102,7 +2102,7 @@ MIIFHjCCAwYCCQDpHKOBI+Lt0zANBgkqhkiG9w0BAQUFADBRMQswCQYDVQQGEwJV def test_prompt_db_properties_oracle_sname(self, gyni_mock, gvsi_mock, rp_mock, smk_mock): ambari_server.PROMPT_DATABASE_OPTIONS = True gyni_mock.return_value = True - list_of_return_values = ["ambari-server", "ambari", "1", "1521", "localhost", "3"] + list_of_return_values = ["ambari-server", "ambari", "1", "1521", "localhost", "2"] def side_effect(*args, **kwargs): return list_of_return_values.pop() @@ -2128,7 +2128,7 @@ MIIFHjCCAwYCCQDpHKOBI+Lt0zANBgkqhkiG9w0BAQUFADBRMQswCQYDVQQGEwJV def test_prompt_db_properties_oracle_sid(self, gyni_mock, gvsi_mock, rp_mock, smk_mock): ambari_server.PROMPT_DATABASE_OPTIONS = True gyni_mock.return_value = True - list_of_return_values = ["ambari-server", "ambari", "2", "1521", "localhost", "3"] + list_of_return_values = ["ambari-server", "ambari", "2", "1521", "localhost", "2"] def side_effect(*args, **kwargs): return list_of_return_values.pop()
