add enable_ha env in bashrc

apache · Nov 7, 2016 · ed2f03e · ed2f03e
1 parent f1c3340
commit ed2f03e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/install/python-installer/bashrc.template b/install/python-installer/bashrc.template
@@ -49,6 +49,7 @@ export NODE_LIST="{{ node_list }}"
 export MY_NODES="{{ my_nodes }}"
 export node_count="{{ node_count }}"
 export HADOOP_TYPE="{{ hadoop_type }}"
+export ENABLE_HA="{{ enable_ha }}"
 
 #-------------------------------------------
 # Execute the sqenv.sh script if it exists.

diff --git a/install/python-installer/db_install.py b/install/python-installer/db_install.py
@@ -494,13 +494,15 @@ def user_input(options, prompt_mode=True, pwd=''):
 
     # DCS HA
     g('dcs_ha')
+    cfgs['enable_ha'] = 'false'
     if cfgs['dcs_ha'].upper() == 'Y':
         g('dcs_floating_ip')
         g('dcs_interface')
         g('dcs_backup_nodes')
         # check dcs backup nodes should exist in node list
         if sorted(list(set((cfgs['dcs_backup_nodes'] + ',' + cfgs['node_list']).split(',')))) != sorted(cfgs['node_list'].split(',')):
             log_err('Invalid DCS backup nodes, please pick up from node list')
+        cfgs['enable_ha'] = 'true'
 
     if need_java_home:
         g('java_home')

diff --git a/install/python-installer/traf_package.py b/install/python-installer/traf_package.py
@@ -36,7 +36,6 @@ def run():
     TRAF_PACKAGE_FILE = '/tmp/' + dbcfgs['traf_package'].split('/')[-1]
     run_cmd('mkdir -p %s' % TRAF_DIR)
     run_cmd('tar xf %s -C %s' % (TRAF_PACKAGE_FILE, TRAF_DIR))
-    run_cmd('rm -rf %s' % TRAF_PACKAGE_FILE)
 
     print 'Trafodion package extracted successfully!'
 

diff --git a/install/python-installer/traf_user.py b/install/python-installer/traf_user.py
@@ -87,7 +87,8 @@ def run():
         '{{ sq_home }}': SQ_ROOT,
         '{{ hadoop_type }}': hadoop_type,
         '{{ node_list }}': ' '.join(nodes),
-        '{{ node_count }}':str(len(nodes)),
+        '{{ node_count }}': str(len(nodes)),
+        '{{ enable_ha }}': dbcfgs['enable_ha'],
         '{{ my_nodes }}': ' -w ' + ' -w '.join(nodes)
     }