trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sand...@apache.org
Subject [40/50] [abbrv] incubator-trafodion git commit: [TRAFODION-2577] Add missing config variables in Ambari install
Date Fri, 12 May 2017 07:52:07 GMT
[TRAFODION-2577] Add missing config variables in Ambari install

Based on python-installer, added these to config:
  ZOOKEEPER_NODES
  ZOOKEEPER_PORT
  SECURE_HADOOP
  CLUSTERNAME


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

Branch: refs/heads/master
Commit: cc80a5e74f4a3864b87c765fd6db5bf4b24fc2cf
Parents: 14fd37b
Author: Steve Varnau <svarnau@apache.org>
Authored: Wed Apr 5 22:12:44 2017 +0000
Committer: Steve Varnau <svarnau@apache.org>
Committed: Wed Apr 5 22:12:44 2017 +0000

----------------------------------------------------------------------
 .../TRAFODION/2.1/configuration/traf-cluster-env.xml             | 1 +
 .../TRAFODION/2.1/configuration/trafodion-env.xml                | 4 ++++
 .../common-services/TRAFODION/2.1/package/scripts/params.py      | 2 ++
 .../TRAFODION/2.1/package/scripts/trafodionmaster.py             | 3 ++-
 4 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cc80a5e7/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/configuration/traf-cluster-env.xml
----------------------------------------------------------------------
diff --git a/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/configuration/traf-cluster-env.xml
b/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/configuration/traf-cluster-env.xml
index dca5d97..b06e165 100644
--- a/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/configuration/traf-cluster-env.xml
+++ b/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/configuration/traf-cluster-env.xml
@@ -32,6 +32,7 @@
 export NODE_LIST="{{traf_nodes}}"
 export MY_NODES="{{traf_w_nodes}}"
 export node_count="{{traf_node_count}}"
+export CLUSTERNAME="{{cluster_name}}"
 
     </value>
     <value-attributes>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cc80a5e7/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/configuration/trafodion-env.xml
----------------------------------------------------------------------
diff --git a/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/configuration/trafodion-env.xml
b/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/configuration/trafodion-env.xml
index c2cdf22..f02e76b 100644
--- a/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/configuration/trafodion-env.xml
+++ b/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/configuration/trafodion-env.xml
@@ -187,6 +187,10 @@ export DB_ADMIN_USER={{traf_db_admin}}
 export HADOOP_TYPE="hortonworks"
 
 export TRAFODION_ENABLE_AUTHENTICATION={{traf_ldap_enabled}}
+export SECURE_HADOOP={{security_enabled}}
+
+export ZOOKEEPER_NODES={{zookeeper_quorum_hosts}}
+export ZOOKEEPER_PORT={{zookeeper_clientPort}}
   
     </value>
     <value-attributes>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cc80a5e7/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/package/scripts/params.py
b/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/package/scripts/params.py
index 9890975..a1d0ca5 100755
--- a/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/package/scripts/params.py
+++ b/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/package/scripts/params.py
@@ -27,6 +27,8 @@ config = Script.get_config()
 java_home = config['hostLevelParams']['java_home']
 java_version = int(config['hostLevelParams']['java_version'])
 
+cluster_name = str(config['clusterName'])
+
 dcs_servers = config['configurations']['dcs-env']['dcs.servers']
 dcs_master_port = config['configurations']['dcs-site']['dcs.master.port']
 dcs_info_port = config['configurations']['dcs-site']['dcs.master.info.port']

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cc80a5e7/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/package/scripts/trafodionmaster.py
----------------------------------------------------------------------
diff --git a/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/package/scripts/trafodionmaster.py
b/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/package/scripts/trafodionmaster.py
index c7d9a29..8e03145 100755
--- a/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/package/scripts/trafodionmaster.py
+++ b/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/package/scripts/trafodionmaster.py
@@ -94,7 +94,8 @@ class Master(Script):
          content=InlineTemplate(params.traf_clust_template,
                                 traf_nodes=traf_nodes,
                                 traf_w_nodes=traf_w_nodes,
-                                traf_node_count=traf_node_count),
+                                traf_node_count=traf_node_count,
+                                cluster_name=params.cluster_name),
          mode=0644)
 
     # install cluster-env on all nodes


Mime
View raw message