You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by fb...@apache.org on 2015/05/06 18:52:53 UTC
ambari git commit: AMBARI-10901 [WinTP2] Ambari Service silent setup
doesn't customize the service logon account
Repository: ambari
Updated Branches:
refs/heads/trunk a1effe19f -> 8ce46ac26
AMBARI-10901 [WinTP2] Ambari Service silent setup doesn't customize the service logon account
Fixed variable assignment in the Windows user checks
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8ce46ac2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8ce46ac2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8ce46ac2
Branch: refs/heads/trunk
Commit: 8ce46ac2614a2da6b62b54fa6df3789dc6b75b6d
Parents: a1effe1
Author: Florian Barca <fb...@hortonworks.com>
Authored: Wed May 6 09:52:05 2015 -0700
Committer: Florian Barca <fb...@hortonworks.com>
Committed: Wed May 6 09:52:30 2015 -0700
----------------------------------------------------------------------
.../src/main/python/ambari_server/serverSetup.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8ce46ac2/ambari-server/src/main/python/ambari_server/serverSetup.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_server/serverSetup.py b/ambari-server/src/main/python/ambari_server/serverSetup.py
index 9986422..4547145 100644
--- a/ambari-server/src/main/python/ambari_server/serverSetup.py
+++ b/ambari-server/src/main/python/ambari_server/serverSetup.py
@@ -210,18 +210,18 @@ class AmbariUserChecksWindows(AmbariUserChecks):
self.NR_DEFAULT_USER = "NT AUTHORITY\\SYSTEM"
self.NR_SYSTEM_USERS = ["NT AUTHORITY\\SYSTEM", "NT AUTHORITY\\NetworkService", "NT AUTHORITY\\LocalService"]
- self.username = options.svc_user
+ self.user = options.svc_user
self.password = options.svc_password
def _create_custom_user(self):
user = get_validated_string_input(
- "Enter user account for ambari-server service ({0}):".format(self.username),
- self.username, None,
+ "Enter user account for ambari-server service ({0}):".format(self.user),
+ self.user, None,
"Invalid username.",
False
)
if user in self.NR_SYSTEM_USERS:
- self.username = user
+ self.user = user
return 0
from ambari_commons.os_windows import UserHelper
@@ -265,7 +265,7 @@ class AmbariUserChecksWindows(AmbariUserChecks):
if user.find('\\') == -1:
user = '.\\' + user
- self.username = user
+ self.user = user
return 0
@OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)