trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hfutm...@apache.org
Subject [06/10] incubator-trafodion git commit: [TRAFODION-2518] pyinstaller - remove unused db_admin settings.
Date Sat, 01 Apr 2017 04:17:48 GMT
[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/eaa45f6f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/eaa45f6f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/eaa45f6f

Branch: refs/heads/master
Commit: eaa45f6f52e93c4ef5030baa447bde715cce8f3e
Parents: 6a65dca
Author: Eason <hfutmkby@gmail.com>
Authored: Tue Mar 7 00:28:09 2017 +0800
Committer: Eason <hfutmkby@gmail.com>
Committed: Fri Mar 31 15:42:30 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               |  2 +-
 4 files changed, 1 insertion(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/eaa45f6f/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/eaa45f6f/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/eaa45f6f/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/eaa45f6f/install/python-installer/db_uninstall.py
----------------------------------------------------------------------
diff --git a/install/python-installer/db_uninstall.py b/install/python-installer/db_uninstall.py
index 9372f34..d3990c7 100755
--- a/install/python-installer/db_uninstall.py
+++ b/install/python-installer/db_uninstall.py
@@ -96,7 +96,7 @@ 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:


Mime
View raw message