ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tbeerbo...@apache.org
Subject ambari git commit: AMBARI-16690 - Atlas Integration : Change default expanded web app directory
Date Wed, 18 May 2016 13:14:52 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 7d516272c -> c418de5cd


AMBARI-16690 - Atlas Integration : Change default expanded web app directory


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

Branch: refs/heads/trunk
Commit: c418de5cd602d259da8476b414646b6ce744f3b2
Parents: 7d51627
Author: tbeerbower <tbeerbower@hortonworks.com>
Authored: Wed May 18 09:14:28 2016 -0400
Committer: tbeerbower <tbeerbower@hortonworks.com>
Committed: Wed May 18 09:14:37 2016 -0400

----------------------------------------------------------------------
 .../common-services/ATLAS/0.1.0.2.3/package/scripts/params.py  | 6 +++---
 .../services/ATLAS/configuration/application-properties.xml    | 5 +++++
 .../src/test/python/stacks/2.3/ATLAS/test_metadata_server.py   | 6 +++---
 .../src/test/python/stacks/2.5/ATLAS/test_atlas_server.py      | 6 +++---
 4 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/c418de5c/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
index b33a956..21bc0c5 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
@@ -112,8 +112,8 @@ metadata_env_content = config['configurations']['atlas-env']['content']
 
 metadata_opts = config['configurations']['atlas-env']['metadata_opts']
 metadata_classpath = config['configurations']['atlas-env']['metadata_classpath']
-data_dir = config['configurations']['atlas-env']['metadata_data_dir']
-expanded_war_dir = os.environ['METADATA_EXPANDED_WEBAPP_DIR'] if 'METADATA_EXPANDED_WEBAPP_DIR'
in os.environ else '/var/lib/atlas/server/webapp'
+data_dir = format("{stack_root}/current/atlas-server/data")
+expanded_war_dir = os.environ['METADATA_EXPANDED_WEBAPP_DIR'] if 'METADATA_EXPANDED_WEBAPP_DIR'
in os.environ else format("{stack_root}/current/atlas-server/server/webapp")
 
 metadata_log4j_content = config['configurations']['atlas-log4j']['content']
 
@@ -183,4 +183,4 @@ for host in zookeeper_hosts:
   index += 1
   if index < len(zookeeper_hosts):
     zookeeper_quorum += ","
-    solr_zookeeper_url += ","
\ No newline at end of file
+    solr_zookeeper_url += ","

http://git-wip-us.apache.org/repos/asf/ambari/blob/c418de5c/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml
index 03f825b..2dab35a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml
@@ -81,4 +81,9 @@
     <value>{{atlas_policy_store_file}}</value>
     <description>Path for the Atlas policy file.</description>
   </property>
+  <property>
+    <name>atlas.kafka.auto.commit.enable</name>
+    <value>false</value>
+    <description>Kafka auto commit setting for Atlas notifications.</description>
+  </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/c418de5c/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py b/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
index 80a345e..98fc678 100644
--- a/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
+++ b/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
@@ -66,21 +66,21 @@ class TestMetadataServer(RMFTestCase):
                                 cd_access='a',
                                 mode=0755
                                 )
-      self.assertResourceCalled('Directory', '/var/lib/atlas/data',
+      self.assertResourceCalled('Directory', '/usr/hdp/current/atlas-server/data',
                                 owner='atlas',
                                 group='hadoop',
                                 create_parents = True,
                                 cd_access='a',
                                 mode=0644
       )
-      self.assertResourceCalled('Directory', '/var/lib/atlas/server/webapp',
+      self.assertResourceCalled('Directory', '/usr/hdp/current/atlas-server/server/webapp',
                                 owner='atlas',
                                 group='hadoop',
                                 create_parents = True,
                                 cd_access='a',
                                 mode=0644
       )
-      self.assertResourceCalled('File', '/var/lib/atlas/server/webapp/atlas.war',
+      self.assertResourceCalled('File', '/usr/hdp/current/atlas-server/server/webapp/atlas.war',
           content = StaticFile('/usr/hdp/current/atlas-server/server/webapp/atlas.war'),
       )
       appprops =  dict(self.getConfig()['configurations'][

http://git-wip-us.apache.org/repos/asf/ambari/blob/c418de5c/ambari-server/src/test/python/stacks/2.5/ATLAS/test_atlas_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.5/ATLAS/test_atlas_server.py b/ambari-server/src/test/python/stacks/2.5/ATLAS/test_atlas_server.py
index daa40d6..9d0f00c 100644
--- a/ambari-server/src/test/python/stacks/2.5/ATLAS/test_atlas_server.py
+++ b/ambari-server/src/test/python/stacks/2.5/ATLAS/test_atlas_server.py
@@ -63,21 +63,21 @@ class TestAtlasServer(RMFTestCase):
                               cd_access='a',
                               mode=0755
                               )
-    self.assertResourceCalled('Directory', '/var/lib/atlas/data',
+    self.assertResourceCalled('Directory', '/usr/hdp/current/atlas-server/data',
                               owner='atlas',
                               group='hadoop',
                               create_parents = True,
                               cd_access='a',
                               mode=0644
                               )
-    self.assertResourceCalled('Directory', '/var/lib/atlas/server/webapp',
+    self.assertResourceCalled('Directory', '/usr/hdp/current/atlas-server/server/webapp',
                               owner='atlas',
                               group='hadoop',
                               create_parents = True,
                               cd_access='a',
                               mode=0644
                               )
-    self.assertResourceCalled('File', '/var/lib/atlas/server/webapp/atlas.war',
+    self.assertResourceCalled('File', '/usr/hdp/current/atlas-server/server/webapp/atlas.war',
                               content = StaticFile('/usr/hdp/current/atlas-server/server/webapp/atlas.war'),
                               )
     appprops =  dict(self.getConfig()['configurations'][


Mime
View raw message