Repository: ambari Updated Branches: refs/heads/branch-2.4 9201b6498 -> 2f89a707c
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/2f89a707 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2f89a707 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2f89a707 Branch: refs/heads/branch-2.4 Commit: 2f89a707cb33fc52fef6f0d9374e29a466ce499f Parents: 9201b64 Author: tbeerbower <[email protected]> Authored: Wed May 18 09:14:28 2016 -0400 Committer: tbeerbower <[email protected]> Committed: Wed May 18 09:15:42 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/2f89a707/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 21199d8..9e22808 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 @@ -111,8 +111,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'] @@ -182,4 +182,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/2f89a707/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/2f89a707/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/2f89a707/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'][
