Repository: ambari Updated Branches: refs/heads/branch-2.5 e382df243 -> 548a0b6a3
http://git-wip-us.apache.org/repos/asf/ambari/blob/548a0b6a/ambari-logsearch/docker/test-config/logsearch/logsearch-https.properties ---------------------------------------------------------------------- diff --git a/ambari-logsearch/docker/test-config/logsearch/logsearch-https.properties b/ambari-logsearch/docker/test-config/logsearch/logsearch-https.properties index 1bd8c70..39c0dac 100644 --- a/ambari-logsearch/docker/test-config/logsearch/logsearch-https.properties +++ b/ambari-logsearch/docker/test-config/logsearch/logsearch-https.properties @@ -36,6 +36,9 @@ logsearch.solr.collection.history=history logsearch.solr.history.config.name=history logsearch.collection.history.replication.factor=1 +logsearch.solr.config_set.folder=/root/ambari/ambari-logsearch/ambari-logsearch-portal/target/package/solr_configsets +logsearch.solr.audit.logs.config_set.folder=/root/ambari/ambari-logsearch/ambari-logsearch-portal/target/package/solr_configsets + # Metrics logsearch.solr.metrics.collector.hosts= logsearch.solr.jmx.port=18886 http://git-wip-us.apache.org/repos/asf/ambari/blob/548a0b6a/ambari-logsearch/docker/test-config/logsearch/logsearch.properties ---------------------------------------------------------------------- diff --git a/ambari-logsearch/docker/test-config/logsearch/logsearch.properties b/ambari-logsearch/docker/test-config/logsearch/logsearch.properties index 71c1a1c..6a97efc 100644 --- a/ambari-logsearch/docker/test-config/logsearch/logsearch.properties +++ b/ambari-logsearch/docker/test-config/logsearch/logsearch.properties @@ -31,6 +31,9 @@ logsearch.audit.logs.split.interval.mins=15 logsearch.collection.audit.logs.numshards=3 logsearch.collection.audit.logs.replication.factor=2 +logsearch.solr.config_set.folder=/root/ambari/ambari-logsearch/ambari-logsearch-portal/target/package/solr_configsets +logsearch.solr.audit.logs.config_set.folder=/root/ambari/ambari-logsearch/ambari-logsearch-portal/target/package/solr_configsets + # History logs logsearch.solr.collection.history=history logsearch.solr.history.config.name=history http://git-wip-us.apache.org/repos/asf/ambari/blob/548a0b6a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/infra_solr.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/infra_solr.py b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/infra_solr.py index 532be47..4a8b9c0 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/infra_solr.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/infra_solr.py @@ -18,6 +18,7 @@ limitations under the License. """ from resource_management.core.resources.system import Execute, File +from resource_management.core.resources.zkmigrator import ZkMigrator from resource_management.core.logger import Logger from resource_management.libraries.script.script import Script from resource_management.libraries.functions.format import format @@ -105,6 +106,18 @@ class InfraSolr(Script): action="delete" ) + def disable_security(self, env): + import params + if not params.infra_solr_znode: + Logger.info("Skipping reverting ACL") + return + zkmigrator = ZkMigrator( + zk_host=params.zookeeper_quorum, + java_exec=params.java_exec, + java_home=params.java64_home, + jaas_file=params.infra_solr_jaas_file, + user=params.infra_solr_user) + zkmigrator.set_acls(params.infra_solr_znode, 'world:anyone:crdwa') if __name__ == "__main__": InfraSolr().execute() \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/548a0b6a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/params.py index 946cf15..c2b8a44 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/params.py @@ -31,6 +31,16 @@ def get_port_from_url(address): else: return address +def get_name_from_principal(principal): + if not principal: # return if empty + return principal + slash_split = principal.split('/') + if len(slash_split) == 2: + return slash_split[0] + else: + at_split = principal.split('@') + return at_split[0] + # config object that holds the configurations declared in the -site.xml file config = Script.get_config() tmp_dir = Script.get_tmp_dir() @@ -50,6 +60,7 @@ fetch_nonlocal_groups = config['configurations']['cluster-env']["fetch_nonlocal_ # shared configs java64_home = config['hostLevelParams']['java_home'] +java_exec = format("{java64_home}/bin/java") zookeeper_hosts_list = config['clusterHostInfo']['zookeeper_hosts'] zookeeper_hosts_list.sort() # get comma separated list of zookeeper hosts from clusterHostInfo @@ -107,6 +118,7 @@ if security_enabled: infra_solr_web_kerberos_keytab = config['configurations']['infra-solr-env']['infra_solr_web_kerberos_keytab'] infra_solr_web_kerberos_principal = config['configurations']['infra-solr-env']['infra_solr_web_kerberos_principal'].replace('_HOST',_hostname_lowercase) infra_solr_kerberos_name_rules = config['configurations']['infra-solr-env']['infra_solr_kerberos_name_rules'].replace('$', '\$') + infra_solr_sasl_user = get_name_from_principal(infra_solr_kerberos_principal) #Solr log4j infra_log_maxfilesize = default('configurations/infra-solr-log4j/infra_log_maxfilesize',10) http://git-wip-us.apache.org/repos/asf/ambari/blob/548a0b6a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/setup_infra_solr.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/setup_infra_solr.py b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/setup_infra_solr.py index 740c560..46535cd 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/setup_infra_solr.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/setup_infra_solr.py @@ -99,6 +99,15 @@ def setup_infra_solr(name = None): secure=params.security_enabled ) + if params.security_enabled: + solr_cloud_util.secure_solr_znode( + zookeeper_quorum=params.zookeeper_quorum, + solr_znode=params.infra_solr_znode, + jaas_file=jaas_file, + java64_home=params.java64_home, + sasl_users_str=params.infra_solr_sasl_user + ) + elif name == 'client': solr_cloud_util.setup_solr_client(params.config) http://git-wip-us.apache.org/repos/asf/ambari/blob/548a0b6a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py index e9ab98f..7f502d7 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py @@ -33,6 +33,16 @@ def get_port_from_url(address): else: return address +def get_name_from_principal(principal): + if not principal: # return if empty + return principal + slash_split = principal.split('/') + if len(slash_split) == 2: + return slash_split[0] + else: + at_split = principal.split('@') + return at_split[0] + # config object that holds the configurations declared in the -site.xml file config = Script.get_config() @@ -148,8 +158,6 @@ else: zookeeper_quorum = logsearch_solr_zk_quorum - - # logsearch-env configs logsearch_user = config['configurations']['logsearch-env']['logsearch_user'] logsearch_log_dir = config['configurations']['logsearch-env']['logsearch_log_dir'] @@ -229,6 +237,14 @@ logsearch_properties['logsearch.auth.simple.enabled'] = 'false' logsearch_properties['logsearch.protocol'] = logsearch_ui_protocol +logsearch_acls = '' +if 'infra-solr-env' in config['configurations'] and security_enabled and not logsearch_use_external_solr: + acl_infra_solr_principal = get_name_from_principal(config['configurations']['infra-solr-env']['infra_solr_kerberos_principal']) + acl_logsearch_principal = get_name_from_principal(config['configurations']['logsearch-env']['logsearch_kerberos_principal']) + logsearch_acls = format('world:anyone:r,sasl:{acl_infra_solr_principal}:cdrwa,sasl:{acl_logsearch_principal}:cdrwa') + logsearch_properties['logsearch.solr.zk.acls'] = logsearch_acls + logsearch_properties['logsearch.solr.audit.logs.zk.acls'] = logsearch_acls + # load config values logsearch_properties = dict(logsearch_properties.items() + dict(config['configurations']['logsearch-properties']).items()) http://git-wip-us.apache.org/repos/asf/ambari/blob/548a0b6a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/service_check.py index 30a1cda..c81268c 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/service_check.py +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/service_check.py @@ -28,7 +28,7 @@ class LogSearchServiceCheck(Script): try: Execute(params.smoke_logsearch_cmd, user=params.logsearch_user, - tries=10, try_sleep=5, timeout=10) + tries=15, try_sleep=5, timeout=10) Logger.info('Log Search Server up and running') except: Logger.error('Log Search Server not running') http://git-wip-us.apache.org/repos/asf/ambari/blob/548a0b6a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch.py b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch.py index 2690a3a..08d3d9d 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch.py +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch.py @@ -17,11 +17,8 @@ limitations under the License. """ -from resource_management.core.exceptions import Fail -from resource_management.libraries.functions import solr_cloud_util from resource_management.core.resources.system import Directory, Execute, File from resource_management.libraries.functions.format import format -from resource_management.libraries.functions.decorator import retry from resource_management.core.source import InlineTemplate, Template from resource_management.libraries.resources.properties_file import PropertiesFile @@ -119,42 +116,7 @@ def setup_logsearch(): content=Template("logsearch_jaas.conf.j2"), owner=params.logsearch_user ) - check_znode() - - upload_conf_set(format('{logsearch_solr_collection_service_logs}'), - solrconfig_content=InlineTemplate(params.logsearch_service_logs_solrconfig_content) - ) - - upload_conf_set('history') - - upload_conf_set(format('{logsearch_solr_collection_audit_logs}'), - solrconfig_content=InlineTemplate(params.logsearch_audit_logs_solrconfig_content) - ) Execute(("chmod", "-R", "ugo+r", format("{logsearch_server_conf}/solr_configsets")), sudo=True ) - - -def upload_conf_set(config_set, solrconfig_content = None): - import params - jaas_file = params.logsearch_jaas_file if params.logsearch_solr_kerberos_enabled else None - solr_cloud_util.upload_configuration_to_zk( - zookeeper_quorum=params.logsearch_solr_zk_quorum, - solr_znode=params.logsearch_solr_zk_znode, - config_set_dir=format("{logsearch_server_conf}/solr_configsets/{config_set}/conf"), - config_set=config_set, - tmp_dir=params.tmp_dir, - java64_home=params.java64_home, - solrconfig_content= solrconfig_content, - jaas_file=jaas_file, - retry=30, interval=5) - -@retry(times=30, sleep_time=5, err_class=Fail) -def check_znode(): - import params - solr_cloud_util.check_znode( - zookeeper_quorum=params.logsearch_solr_zk_quorum, - solr_znode=params.logsearch_solr_zk_znode, - java64_home=params.java64_home, - retry=30, interval=5) http://git-wip-us.apache.org/repos/asf/ambari/blob/548a0b6a/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 7d501a7..e97759b 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 @@ -142,8 +142,7 @@ class TestMetadataServer(RMFTestCase): mode=0755, ) self.assertResourceCalled('File', '/usr/lib/ambari-infra-solr-client/log4j.properties', - content=InlineTemplate(self.getConfig()['configurations'][ - 'infra-solr-client-log4j']['content']), + content=self.getConfig()['configurations']['infra-solr-client-log4j']['content'], mode=0644, ) self.assertResourceCalled('File', '/var/log/ambari-infra-solr-client/solr-client.log', @@ -285,8 +284,7 @@ class TestMetadataServer(RMFTestCase): mode=0755, ) self.assertResourceCalled('File', '/usr/lib/ambari-infra-solr-client/log4j.properties', - content=InlineTemplate(self.getConfig()['configurations'][ - 'infra-solr-client-log4j']['content']), + content=self.getConfig()['configurations']['infra-solr-client-log4j']['content'], mode=0644, ) self.assertResourceCalled('File', '/var/log/ambari-infra-solr-client/solr-client.log', http://git-wip-us.apache.org/repos/asf/ambari/blob/548a0b6a/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py b/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py index 33ac715..f63cd42 100644 --- a/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py +++ b/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py @@ -149,39 +149,6 @@ class TestLogSearch(RMFTestCase): group='hadoop', content = InlineTemplate(self.getConfig()['configurations']['logsearch-audit_logs-solrconfig']['content']) ) - - self.assertResourceCalled('Execute', 'ambari-sudo.sh JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/lib/ambari-infra-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181 --znode /infra-solr --check-znode --retry 30 --interval 5') - self.assertResourceCalledRegexp('^Execute$', '^ambari-sudo.sh JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/lib/ambari-infra-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181/infra-solr --download-config --config-dir /tmp/solr_config_hadoop_logs_0.[0-9]* --config-set hadoop_logs --retry 30 --interval 5') - self.assertResourceCalledRegexp('^File$', '^/tmp/solr_config_hadoop_logs_0.[0-9]*', - content=InlineTemplate(self.getConfig()['configurations']['logsearch-service_logs-solrconfig']['content']), - only_if='test -d /tmp/solr_config_hadoop_logs_0.[0-9]*') - self.assertResourceCalledRegexp('^Execute$', '^ambari-sudo.sh JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/lib/ambari-infra-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181/infra-solr --upload-config --config-dir /tmp/solr_config_hadoop_logs_0.[0-9]* --config-set hadoop_logs --retry 30 --interval 5', - only_if='test -d /tmp/solr_config_hadoop_logs_0.[0-9]*') - - self.assertResourceCalledRegexp('^Execute$', '^ambari-sudo.sh JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/lib/ambari-infra-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181/infra-solr --upload-config --config-dir /etc/ambari-logsearch-portal/conf/solr_configsets/hadoop_logs/conf --config-set hadoop_logs --retry 30 --interval 5', - not_if='test -d /tmp/solr_config_hadoop_logs_0.[0-9]*') - self.assertResourceCalledRegexp('^Directory$', '^/tmp/solr_config_hadoop_logs_0.[0-9]*', - action=['delete'], - create_parents=True) - - - self.assertResourceCalledRegexp('^Execute$', '^ambari-sudo.sh JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/lib/ambari-infra-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181/infra-solr --download-config --config-dir /tmp/solr_config_history_0.[0-9]* --config-set history --retry 30 --interval 5') - self.assertResourceCalledRegexp('^Execute$', '^ambari-sudo.sh JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/lib/ambari-infra-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181/infra-solr --upload-config --config-dir /etc/ambari-logsearch-portal/conf/solr_configsets/history/conf --config-set history --retry 30 --interval 5') - self.assertResourceCalledRegexp('^Directory$', '^/tmp/solr_config_history_0.[0-9]*', - action=['delete'], - create_parents=True) - - self.assertResourceCalledRegexp('^Execute$', '^ambari-sudo.sh JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/lib/ambari-infra-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181/infra-solr --download-config --config-dir /tmp/solr_config_audit_logs_0.[0-9]* --config-set audit_logs --retry 30 --interval 5') - self.assertResourceCalledRegexp('^File$', '^/tmp/solr_config_audit_logs_0.[0-9]*', - content=InlineTemplate(self.getConfig()['configurations']['logsearch-audit_logs-solrconfig']['content']), - only_if='test -d /tmp/solr_config_audit_logs_0.[0-9]*') - self.assertResourceCalledRegexp('^Execute$', '^ambari-sudo.sh JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/lib/ambari-infra-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181/infra-solr --upload-config --config-dir /tmp/solr_config_audit_logs_0.[0-9]* --config-set audit_logs --retry 30 --interval 5', - only_if='test -d /tmp/solr_config_audit_logs_0.[0-9]*') - self.assertResourceCalledRegexp('^Execute$', '^ambari-sudo.sh JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/lib/ambari-infra-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181/infra-solr --upload-config --config-dir /etc/ambari-logsearch-portal/conf/solr_configsets/audit_logs/conf --config-set audit_logs --retry 30 --interval 5', - not_if='test -d /tmp/solr_config_audit_logs_0.[0-9]*') - self.assertResourceCalledRegexp('^Directory$', '^/tmp/solr_config_audit_logs_0.[0-9]*', - action=['delete'], - create_parents=True) self.assertResourceCalled('Execute', ('chmod', '-R', 'ugo+r', '/etc/ambari-logsearch-portal/conf/solr_configsets'), sudo = True ) http://git-wip-us.apache.org/repos/asf/ambari/blob/548a0b6a/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 4db31ca..bbaef78 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 @@ -140,8 +140,7 @@ class TestAtlasServer(RMFTestCase): mode=0755 ) self.assertResourceCalled('File', '/usr/lib/ambari-infra-solr-client/log4j.properties', - content=InlineTemplate(self.getConfig()['configurations'][ - 'infra-solr-client-log4j']['content']), + content=self.getConfig()['configurations']['infra-solr-client-log4j']['content'], mode=0644, ) self.assertResourceCalled('File', '/var/log/ambari-infra-solr-client/solr-client.log', http://git-wip-us.apache.org/repos/asf/ambari/blob/548a0b6a/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py b/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py index 8e959ad..b01e7da 100644 --- a/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py +++ b/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py @@ -67,7 +67,7 @@ class TestRangerAdmin(RMFTestCase): mode = 0755, ) self.assertResourceCalled('File', '/usr/lib/ambari-infra-solr-client/log4j.properties', - content = InlineTemplate(self.getConfig()['configurations']['infra-solr-client-log4j']['content']), + content = self.getConfig()['configurations']['infra-solr-client-log4j']['content'], mode = 0644, ) self.assertResourceCalled('File', '/var/log/ambari-infra-solr-client/solr-client.log', @@ -148,7 +148,7 @@ class TestRangerAdmin(RMFTestCase): mode = 0755, ) self.assertResourceCalled('File', '/usr/lib/ambari-infra-solr-client/log4j.properties', - content = InlineTemplate(self.getConfig()['configurations']['infra-solr-client-log4j']['content']), + content = self.getConfig()['configurations']['infra-solr-client-log4j']['content'], mode = 0644, ) self.assertResourceCalled('File', '/var/log/ambari-infra-solr-client/solr-client.log', http://git-wip-us.apache.org/repos/asf/ambari/blob/548a0b6a/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-default.json b/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-default.json index 4510f4b..a1d930c 100644 --- a/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-default.json +++ b/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-default.json @@ -672,7 +672,7 @@ }, "infra-solr-client-log4j": { "infra_solr_client_log_dir" : "/var/log/ambari-infra-solr-client", - "content": "# Copyright 2011 The Apache Software Foundation\n#\n# Licensed to the Apache Software Foundation (ASF) under one\n# or more contributor license agreements. See the NOTICE file\n# distributed with this work for additional information\n# regarding copyright ownership. The ASF licenses this file\n# to you under the Apache License, Version 2.0 (the\n# \"License\"); you may not use this file except in compliance\n# with the License. You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nlog4j.rootLogger=INFO,file,stdout,stderr\n\nlog4j.appender.file=org.apache.log4j.RollingFileAppender\nlog4j.appender .file.File={{logsearch_solr_client_log}}\nlog4j.appender.file.MaxFileSize=80MB\nlog4j.appender.file.MaxBackupIndex=60\nlog4j.appender.file.layout=org.apache.log4j.PatternLayout\nlog4j.appender.file.layout.ConversionPattern=%d{DATE} %5p [%t] %c{1}:%L - %m%n\n\nlog4j.appender.stdout=org.apache.log4j.ConsoleAppender\nlog4j.appender.stdout.Threshold=INFO\nlog4j.appender.stdout.Target=System.out\nlog4j.appender.stdout.layout=org.apache.log4j.PatternLayout\nlog4j.appender.stdout.layout.ConversionPattern=%m%n\n\nlog4j.appender.stderr=org.apache.log4j.ConsoleAppender\nlog4j.appender.stderr.Threshold=ERROR\nlog4j.appender.stderr.Target=System.err\nlog4j.appender.stderr.layout=org.apache.log4j.PatternLayout\nlog4j.appender.stderr.layout.ConversionPattern=%m%n" + "content": "content" }, "cluster-env": { "security_enabled": "false", http://git-wip-us.apache.org/repos/asf/ambari/blob/548a0b6a/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-secured.json b/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-secured.json index 9144f12..f959b1f 100644 --- a/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-secured.json +++ b/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-secured.json @@ -739,7 +739,7 @@ }, "infra-solr-client-log4j": { "infra_solr_client_log_dir" : "/var/log/ambari-infra-solr-client", - "content": "# Copyright 2011 The Apache Software Foundation\n#\n# Licensed to the Apache Software Foundation (ASF) under one\n# or more contributor license agreements. See the NOTICE file\n# distributed with this work for additional information\n# regarding copyright ownership. The ASF licenses this file\n# to you under the Apache License, Version 2.0 (the\n# \"License\"); you may not use this file except in compliance\n# with the License. You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nlog4j.rootLogger=INFO,file,stdout,stderr\n\nlog4j.appender.file=org.apache.log4j.RollingFileAppender\nlog4j.appender .file.File={{logsearch_solr_client_log}}\nlog4j.appender.file.MaxFileSize=80MB\nlog4j.appender.file.MaxBackupIndex=60\nlog4j.appender.file.layout=org.apache.log4j.PatternLayout\nlog4j.appender.file.layout.ConversionPattern=%d{DATE} %5p [%t] %c{1}:%L - %m%n\n\nlog4j.appender.stdout=org.apache.log4j.ConsoleAppender\nlog4j.appender.stdout.Threshold=INFO\nlog4j.appender.stdout.Target=System.out\nlog4j.appender.stdout.layout=org.apache.log4j.PatternLayout\nlog4j.appender.stdout.layout.ConversionPattern=%m%n\n\nlog4j.appender.stderr=org.apache.log4j.ConsoleAppender\nlog4j.appender.stderr.Threshold=ERROR\nlog4j.appender.stderr.Target=System.err\nlog4j.appender.stderr.layout=org.apache.log4j.PatternLayout\nlog4j.appender.stderr.layout.ConversionPattern=%m%n" + "content": "content" }, "cluster-env": { "security_enabled": "true", http://git-wip-us.apache.org/repos/asf/ambari/blob/548a0b6a/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_admin.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_admin.py b/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_admin.py index 927ee0c..8dda363 100644 --- a/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_admin.py +++ b/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_admin.py @@ -55,7 +55,7 @@ class TestRangerAdmin(RMFTestCase): mode = 0755, ) self.assertResourceCalled('File', '/usr/lib/ambari-infra-solr-client/log4j.properties', - content = InlineTemplate(self.getConfig()['configurations']['infra-solr-client-log4j']['content']), + content = self.getConfig()['configurations']['infra-solr-client-log4j']['content'], mode = 0644, ) self.assertResourceCalled('File', '/var/log/ambari-infra-solr-client/solr-client.log', @@ -122,7 +122,7 @@ class TestRangerAdmin(RMFTestCase): mode = 0755, ) self.assertResourceCalled('File', '/usr/lib/ambari-infra-solr-client/log4j.properties', - content = InlineTemplate(self.getConfig()['configurations']['infra-solr-client-log4j']['content']), + content = self.getConfig()['configurations']['infra-solr-client-log4j']['content'], mode = 0644, ) self.assertResourceCalled('File', '/var/log/ambari-infra-solr-client/solr-client.log', http://git-wip-us.apache.org/repos/asf/ambari/blob/548a0b6a/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-default.json b/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-default.json index e517e3a..2c4815b 100644 --- a/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-default.json +++ b/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-default.json @@ -701,7 +701,7 @@ }, "infra-solr-client-log4j": { "infra_solr_client_log_dir" : "/var/log/ambari-infra-solr-client", - "content": "# Copyright 2011 The Apache Software Foundation\n#\n# Licensed to the Apache Software Foundation (ASF) under one\n# or more contributor license agreements. See the NOTICE file\n# distributed with this work for additional information\n# regarding copyright ownership. The ASF licenses this file\n# to you under the Apache License, Version 2.0 (the\n# \"License\"); you may not use this file except in compliance\n# with the License. You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nlog4j.rootLogger=INFO,file,stdout,stderr\n\nlog4j.appender.file=org.apache.log4j.RollingFileAppender\nlog4j.appender .file.File={{logsearch_solr_client_log}}\nlog4j.appender.file.MaxFileSize=80MB\nlog4j.appender.file.MaxBackupIndex=60\nlog4j.appender.file.layout=org.apache.log4j.PatternLayout\nlog4j.appender.file.layout.ConversionPattern=%d{DATE} %5p [%t] %c{1}:%L - %m%n\n\nlog4j.appender.stdout=org.apache.log4j.ConsoleAppender\nlog4j.appender.stdout.Threshold=INFO\nlog4j.appender.stdout.Target=System.out\nlog4j.appender.stdout.layout=org.apache.log4j.PatternLayout\nlog4j.appender.stdout.layout.ConversionPattern=%m%n\n\nlog4j.appender.stderr=org.apache.log4j.ConsoleAppender\nlog4j.appender.stderr.Threshold=ERROR\nlog4j.appender.stderr.Target=System.err\nlog4j.appender.stderr.layout=org.apache.log4j.PatternLayout\nlog4j.appender.stderr.layout.ConversionPattern=%m%n" + "content": "content" }, "cluster-env": { "security_enabled": "false", http://git-wip-us.apache.org/repos/asf/ambari/blob/548a0b6a/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-secured.json b/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-secured.json index a04f9f8..fa791c1 100644 --- a/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-secured.json +++ b/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-secured.json @@ -768,7 +768,7 @@ }, "infra-solr-client-log4j": { "infra_solr_client_log_dir" : "/var/log/ambari-infra-solr-client", - "content": "# Copyright 2011 The Apache Software Foundation\n#\n# Licensed to the Apache Software Foundation (ASF) under one\n# or more contributor license agreements. See the NOTICE file\n# distributed with this work for additional information\n# regarding copyright ownership. The ASF licenses this file\n# to you under the Apache License, Version 2.0 (the\n# \"License\"); you may not use this file except in compliance\n# with the License. You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nlog4j.rootLogger=INFO,file,stdout,stderr\n\nlog4j.appender.file=org.apache.log4j.RollingFileAppender\nlog4j.appender .file.File={{logsearch_solr_client_log}}\nlog4j.appender.file.MaxFileSize=80MB\nlog4j.appender.file.MaxBackupIndex=60\nlog4j.appender.file.layout=org.apache.log4j.PatternLayout\nlog4j.appender.file.layout.ConversionPattern=%d{DATE} %5p [%t] %c{1}:%L - %m%n\n\nlog4j.appender.stdout=org.apache.log4j.ConsoleAppender\nlog4j.appender.stdout.Threshold=INFO\nlog4j.appender.stdout.Target=System.out\nlog4j.appender.stdout.layout=org.apache.log4j.PatternLayout\nlog4j.appender.stdout.layout.ConversionPattern=%m%n\n\nlog4j.appender.stderr=org.apache.log4j.ConsoleAppender\nlog4j.appender.stderr.Threshold=ERROR\nlog4j.appender.stderr.Target=System.err\nlog4j.appender.stderr.layout=org.apache.log4j.PatternLayout\nlog4j.appender.stderr.layout.ConversionPattern=%m%n" + "content": "content" }, "cluster-env": { "security_enabled": "true",
