You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2017/03/08 19:23:05 UTC
[1/3] incubator-trafodion git commit: [TRAFODION-2518] pyinstaller -
remove unused db_admin settings.
Repository: incubator-trafodion
Updated Branches:
refs/heads/release2.1 4e8dd59b0 -> 4348ce699
[TRAFODION-2518] pyinstaller - remove unused db_admin settings.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/dc6e7bd4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/dc6e7bd4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/dc6e7bd4
Branch: refs/heads/release2.1
Commit: dc6e7bd4081cdf885cba3708c9d7cf727515a6c4
Parents: b02f197
Author: Eason <hf...@gmail.com>
Authored: Tue Mar 7 00:28:09 2017 +0800
Committer: Eason <hf...@gmail.com>
Committed: Tue Mar 7 00:28:09 2017 +0800
----------------------------------------------------------------------
install/python-installer/configs/db_config_default.ini | 2 --
install/python-installer/configs/prompt.json | 11 -----------
install/python-installer/db_install.py | 2 --
install/python-installer/db_uninstall.py | 4 ++--
4 files changed, 2 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/dc6e7bd4/install/python-installer/configs/db_config_default.ini
----------------------------------------------------------------------
diff --git a/install/python-installer/configs/db_config_default.ini b/install/python-installer/configs/db_config_default.ini
index 918bf03..d5e313f 100644
--- a/install/python-installer/configs/db_config_default.ini
+++ b/install/python-installer/configs/db_config_default.ini
@@ -96,8 +96,6 @@ local_repo_dir =
# set it to 'Y' if enable LDAP security
ldap_security = N
-# LDAP user name to be assigned as DB admin privilege
-db_admin_user = admin
# LDAP user to be assigned DB root privileges (DB__ROOT)
db_root_user = trafodion
# if LDAP security is enabled, provide the following items
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/dc6e7bd4/install/python-installer/configs/prompt.json
----------------------------------------------------------------------
diff --git a/install/python-installer/configs/prompt.json b/install/python-installer/configs/prompt.json
index a0782db..d95a45d 100644
--- a/install/python-installer/configs/prompt.json
+++ b/install/python-installer/configs/prompt.json
@@ -206,17 +206,6 @@
"default":"trafodion",
"isuser":true
},
- "db_admin_user":
- {
- "prompt":"Enter LDAP user name to be assigned DB Admin privileges",
- "default":"admin",
- "isuser":true
- },
- "db_admin_pwd":
- {
- "prompt":"Enter LDAP user password to be assigned DB Admin privileges",
- "default":"traf123"
- },
"node_list":
{
"prompt":"Enter list of Nodes separated by comma, support simple numeric RE,\n i.e. \"n[01-12],n[21-25]\",\"n0[1-5].com\""
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/dc6e7bd4/install/python-installer/db_install.py
----------------------------------------------------------------------
diff --git a/install/python-installer/db_install.py b/install/python-installer/db_install.py
index d54a267..dc4e489 100755
--- a/install/python-installer/db_install.py
+++ b/install/python-installer/db_install.py
@@ -519,8 +519,6 @@ def user_input(options, prompt_mode=True, pwd=''):
g('ldap_security')
if cfgs['ldap_security'].upper() == 'Y':
g('db_root_user')
- g('db_admin_user')
- g('db_admin_pwd')
g('ldap_hosts')
g('ldap_port')
g('ldap_identifiers')
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/dc6e7bd4/install/python-installer/db_uninstall.py
----------------------------------------------------------------------
diff --git a/install/python-installer/db_uninstall.py b/install/python-installer/db_uninstall.py
index 5ab23e7..dc1fb43 100755
--- a/install/python-installer/db_uninstall.py
+++ b/install/python-installer/db_uninstall.py
@@ -96,13 +96,13 @@ def main():
remotes = [Remote(node, pwd=pwd) for node in nodes]
# stop trafodion on the first node
- remotes[0].execute('sudo su %s -l -c ckillall' % TRAF_USER, chkerr=False)
+ #remotes[0].execute('sudo su %s -l -c ckillall' % TRAF_USER, chkerr=False)
# remove trafodion userid and group on all trafodion nodes, together with folders
for remote in remotes:
info('Remove Trafodion on node [%s] ...' % remote.host)
remote.execute('ps -ef|grep ^%s|awk \'{print $2}\'|xargs sudo kill -9' % TRAF_USER, chkerr=False)
- remote.execute('ps -ef|grep krb5check|awk \'{print $2}\'|xargs sudo kill -9', chkerr=False) # traf kerberos service
+ remote.execute('trafid=`getent passwd %s|awk -F: \'{print $3}\'`; if [[ -n $trafid ]]; then ps -ef|grep ^$trafid|awk \'{print $2}\'|xargs sudo kill -9; fi' % TRAF_USER, chkerr=False)
remote.execute('sudo -n /usr/sbin/userdel -rf %s' % TRAF_USER, chkerr=False)
remote.execute('sudo -n /usr/sbin/groupdel %s' % TRAF_USER, chkerr=False)
remote.execute('sudo -n rm -rf /etc/security/limits.d/%s.conf %s /tmp/hsperfdata_%s 2>/dev/null' % (TRAF_USER, TRAF_CFG_DIR, TRAF_USER), chkerr=False)
[3/3] incubator-trafodion git commit: Merge [TRAFODION-2518] Remove
unused db_admin settings from pyinstaller
Posted by db...@apache.org.
Merge [TRAFODION-2518] Remove unused db_admin settings from pyinstaller
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/4348ce69
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/4348ce69
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/4348ce69
Branch: refs/heads/release2.1
Commit: 4348ce699c8f4914d93846f699690383d7eb724d
Parents: 4e8dd59 079f1ce
Author: Dave Birdsall <db...@apache.org>
Authored: Wed Mar 8 19:21:52 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Wed Mar 8 19:21:52 2017 +0000
----------------------------------------------------------------------
install/python-installer/configs/db_config_default.ini | 2 --
install/python-installer/configs/prompt.json | 11 -----------
install/python-installer/db_install.py | 2 --
install/python-installer/db_uninstall.py | 6 +++---
4 files changed, 3 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-trafodion git commit: optimize ps command in
uninstall script
Posted by db...@apache.org.
optimize ps command in uninstall script
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/079f1cea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/079f1cea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/079f1cea
Branch: refs/heads/release2.1
Commit: 079f1cea96866beb95417325a560952a74f7bb33
Parents: dc6e7bd
Author: Eason <hf...@gmail.com>
Authored: Tue Mar 7 11:21:23 2017 +0800
Committer: Eason <hf...@gmail.com>
Committed: Tue Mar 7 11:21:23 2017 +0800
----------------------------------------------------------------------
install/python-installer/db_uninstall.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/079f1cea/install/python-installer/db_uninstall.py
----------------------------------------------------------------------
diff --git a/install/python-installer/db_uninstall.py b/install/python-installer/db_uninstall.py
index dc1fb43..d3990c7 100755
--- a/install/python-installer/db_uninstall.py
+++ b/install/python-installer/db_uninstall.py
@@ -101,8 +101,8 @@ def main():
# remove trafodion userid and group on all trafodion nodes, together with folders
for remote in remotes:
info('Remove Trafodion on node [%s] ...' % remote.host)
- remote.execute('ps -ef|grep ^%s|awk \'{print $2}\'|xargs sudo kill -9' % TRAF_USER, chkerr=False)
- remote.execute('trafid=`getent passwd %s|awk -F: \'{print $3}\'`; if [[ -n $trafid ]]; then ps -ef|grep ^$trafid|awk \'{print $2}\'|xargs sudo kill -9; fi' % TRAF_USER, chkerr=False)
+ remote.execute('ps -f -u %s|awk \'{print $2}\'|xargs sudo kill -9' % TRAF_USER, chkerr=False)
+ remote.execute('trafid=`getent passwd %s|awk -F: \'{print $3}\'`; if [[ -n $trafid ]]; then ps -f -u $trafid|awk \'{print $2}\'|xargs sudo kill -9; fi' % TRAF_USER, chkerr=False)
remote.execute('sudo -n /usr/sbin/userdel -rf %s' % TRAF_USER, chkerr=False)
remote.execute('sudo -n /usr/sbin/groupdel %s' % TRAF_USER, chkerr=False)
remote.execute('sudo -n rm -rf /etc/security/limits.d/%s.conf %s /tmp/hsperfdata_%s 2>/dev/null' % (TRAF_USER, TRAF_CFG_DIR, TRAF_USER), chkerr=False)