This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new e46d8ed AMBARI-23194. Values instance has no attribute 'master_key'
during ambari-server reset (#611)
e46d8ed is described below
commit e46d8edc39ea5949756b641ab8881d726c1861e1
Author: Robert Levas <rle...@users.noreply.github.com>
AuthorDate: Sat Mar 10 03:34:04 2018 -0500
AMBARI-23194. Values instance has no attribute 'master_key' during
ambari-server reset (#611)
---
ambari-server/src/main/python/ambari-server.py | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/ambari-server/src/main/python/ambari-server.py
b/ambari-server/src/main/python/ambari-server.py
index be40a80..57ad80e 100755
--- a/ambari-server/src/main/python/ambari-server.py
+++ b/ambari-server/src/main/python/ambari-server.py
@@ -500,6 +500,15 @@ def init_setup_parser_options(parser):
parser.add_option_group(other_group)
@OsFamilyFuncImpl(OsFamilyImpl.DEFAULT)
+def init_reset_parser_options(parser):
+ other_group = optparse.OptionGroup(parser, 'Other options')
+
+ # the --master-key option is needed in the event passwords in the
ambari.properties file are encrypted
+ other_group.add_option('--master-key', default=None, help="Master key for
encrypting passwords", dest="master_key")
+
+ parser.add_option_group(other_group)
+
+@OsFamilyFuncImpl(OsFamilyImpl.DEFAULT)
def init_start_parser_options(parser):
parser.add_option('-g', '--debug', action="store_true", dest='debug',
default=False,
help="Start ambari-server in debug mode")
@@ -823,7 +832,7 @@ def init_action_parser(action, parser):
START_ACTION: init_start_parser_options,
STOP_ACTION: init_empty_parser_options,
RESTART_ACTION: init_start_parser_options,
- RESET_ACTION: init_empty_parser_options,
+ RESET_ACTION: init_reset_parser_options,
STATUS_ACTION: init_empty_parser_options,
UPGRADE_ACTION: init_empty_parser_options,
LDAP_SETUP_ACTION: init_ldap_setup_parser_options,
--
To stop receiving notification emails like this one, please contact
adorosz...@apache.org.
