You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2017/01/22 05:33:28 UTC

[2/2] incubator-trafodion git commit: Merge Fix for [TRAFODION-2453] pyinstaller error on hdp with kerberos enabled.

Merge Fix for [TRAFODION-2453] pyinstaller error on hdp with kerberos enabled.


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/9bb8185b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9bb8185b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9bb8185b

Branch: refs/heads/master
Commit: 9bb8185bcdda712a4b78f72a4c4492f770dae4a7
Parents: 0f5b1a4 f35318b
Author: Liu Ming <ov...@sina.com>
Authored: Sun Jan 22 05:32:56 2017 +0000
Committer: Liu Ming <ov...@sina.com>
Committed: Sun Jan 22 05:32:56 2017 +0000

----------------------------------------------------------------------
 install/python-installer/db_install.py          |  9 ++++-----
 .../python-installer/scripts/traf_discover.py   | 21 ++++++++++----------
 .../python-installer/scripts/traf_kerberos.py   |  4 +++-
 install/python-installer/scripts/traf_user.py   |  5 +++--
 4 files changed, 20 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9bb8185b/install/python-installer/scripts/traf_user.py
----------------------------------------------------------------------
diff --cc install/python-installer/scripts/traf_user.py
index d7d0c66,a7d24b8..1d60ca0
--- a/install/python-installer/scripts/traf_user.py
+++ b/install/python-installer/scripts/traf_user.py
@@@ -67,7 -68,11 +66,8 @@@ def run()
          run_cmd('groupadd %s > /dev/null 2>&1' % TRAF_GROUP)
  
      if not cmd_output('getent passwd %s' % TRAF_USER):
+         TRAF_PWD = dbcfgs['traf_pwd']
          run_cmd('useradd --shell /bin/bash -m %s -g %s --home %s --password "$(openssl passwd %s)"' % (TRAF_USER, TRAF_GROUP, TRAF_USER_DIR, TRAF_PWD))
 -        # copy bashrc to trafodion's home only if user doesn't exist
 -        run_cmd('cp %s %s' % (BASHRC_TEMPLATE, BASHRC_FILE))
 -        run_cmd('chown -R %s:%s %s*' % (TRAF_USER, TRAF_GROUP, BASHRC_FILE))
      elif not os.path.exists(TRAF_USER_DIR):
          run_cmd('mkdir -p %s' % TRAF_USER_DIR)
          run_cmd('chmod 700 %s' % TRAF_USER_DIR)