Repository: ambari Updated Branches: refs/heads/trunk 8b22dd018 -> 1524fd775
http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/ranger-knox-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/ranger-knox-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/ranger-knox-plugin-properties.xml new file mode 100644 index 0000000..3450970 --- /dev/null +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/ranger-knox-plugin-properties.xml @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> +<configuration> + + <property> + <name>external_admin_username</name> + <value></value> + <display-name>External Ranger admin username</display-name> + <description>Add ranger default admin username if want to communicate to external ranger</description> + <value-attributes> + <empty-value-valid>true</empty-value-valid> + </value-attributes> + <on-ambari-upgrade add="true"/> + </property> + + <property> + <name>external_admin_password</name> + <value></value> + <display-name>External Ranger admin password</display-name> + <property-type>PASSWORD</property-type> + <description>Add ranger default admin password if want to communicate to external ranger</description> + <value-attributes> + <type>password</type> + <empty-value-valid>true</empty-value-valid> + </value-attributes> + <on-ambari-upgrade add="true"/> + </property> + + <property> + <name>external_ranger_admin_username</name> + <value></value> + <display-name>External Ranger Ambari admin username</display-name> + <description>Add ranger default ambari admin username if want to communicate to external ranger</description> + <value-attributes> + <empty-value-valid>true</empty-value-valid> + </value-attributes> + <on-ambari-upgrade add="true"/> + </property> + + <property> + <name>external_ranger_admin_password</name> + <value></value> + <display-name>External Ranger Ambari admin password</display-name> + <property-type>PASSWORD</property-type> + <description>Add ranger default ambari admin password if want to communicate to external ranger</description> + <value-attributes> + <type>password</type> + <empty-value-valid>true</empty-value-valid> + </value-attributes> + <on-ambari-upgrade add="true"/> + </property> + +</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-policymgr-ssl.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-policymgr-ssl.xml index 5672f04..21658e7 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-policymgr-ssl.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-policymgr-ssl.xml @@ -23,12 +23,12 @@ <name>xasecure.policymgr.clientssl.keystore</name> <value>/usr/hdp/current/storm-client/conf/ranger-plugin-keystore.jks</value> <description>Java Keystore files</description> - <on-ambari-upgrade add="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.policymgr.clientssl.truststore</name> <value>/usr/hdp/current/storm-client/conf/ranger-plugin-truststore.jks</value> <description>java truststore file</description> - <on-ambari-upgrade add="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-security.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-security.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-security.xml index f3d7530..8a3dd2e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-security.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-security.xml @@ -23,6 +23,6 @@ <name>ranger.plugin.storm.policy.rest.ssl.config.file</name> <value>/usr/hdp/current/storm-client/conf/ranger-policymgr-ssl.xml</value> <description>Path to the file containing SSL details to contact Ranger Admin</description> - <on-ambari-upgrade add="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/ranger-yarn-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/ranger-yarn-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/ranger-yarn-plugin-properties.xml new file mode 100644 index 0000000..3450970 --- /dev/null +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/configuration/ranger-yarn-plugin-properties.xml @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> +<configuration> + + <property> + <name>external_admin_username</name> + <value></value> + <display-name>External Ranger admin username</display-name> + <description>Add ranger default admin username if want to communicate to external ranger</description> + <value-attributes> + <empty-value-valid>true</empty-value-valid> + </value-attributes> + <on-ambari-upgrade add="true"/> + </property> + + <property> + <name>external_admin_password</name> + <value></value> + <display-name>External Ranger admin password</display-name> + <property-type>PASSWORD</property-type> + <description>Add ranger default admin password if want to communicate to external ranger</description> + <value-attributes> + <type>password</type> + <empty-value-valid>true</empty-value-valid> + </value-attributes> + <on-ambari-upgrade add="true"/> + </property> + + <property> + <name>external_ranger_admin_username</name> + <value></value> + <display-name>External Ranger Ambari admin username</display-name> + <description>Add ranger default ambari admin username if want to communicate to external ranger</description> + <value-attributes> + <empty-value-valid>true</empty-value-valid> + </value-attributes> + <on-ambari-upgrade add="true"/> + </property> + + <property> + <name>external_ranger_admin_password</name> + <value></value> + <display-name>External Ranger Ambari admin password</display-name> + <property-type>PASSWORD</property-type> + <description>Add ranger default ambari admin password if want to communicate to external ranger</description> + <value-attributes> + <type>password</type> + <empty-value-valid>true</empty-value-valid> + </value-attributes> + <on-ambari-upgrade add="true"/> + </property> + +</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py index 2ad35a2..afe9fea 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py @@ -1978,6 +1978,13 @@ yarn.scheduler.capacity.root.{0}.maximum-am-resource-percent=1""".format(llap_qu putAtlasRangerAuditProperty('xasecure.audit.destination.hdfs',xasecure_audit_destination_hdfs) putAtlasRangerAuditProperty('xasecure.audit.destination.hdfs.dir',xasecure_audit_destination_hdfs_dir) putAtlasRangerAuditProperty('xasecure.audit.destination.solr',xasecure_audit_destination_solr) + required_services = [ + {'service_name': 'ATLAS', 'config_type': 'ranger-atlas-security'} + ] + + # recommendation for ranger url for ranger-supported plugins + self.recommendRangerUrlConfigurations(configurations, services, required_services) + def validateRangerTagsyncConfigurations(self, properties, recommendedDefaults, configurations, services, hosts): ranger_tagsync_properties = properties http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java index 1830f24..484a09a 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java @@ -284,6 +284,7 @@ public class UpgradeCatalog250Test { Method updateAtlasConfigs = UpgradeCatalog250.class.getDeclaredMethod("updateAtlasConfigs"); Method updateLogSearchConfigs = UpgradeCatalog250.class.getDeclaredMethod("updateLogSearchConfigs"); Method updateAmbariInfraConfigs = UpgradeCatalog250.class.getDeclaredMethod("updateAmbariInfraConfigs"); + Method updateRangerUrlConfigs = UpgradeCatalog250.class.getDeclaredMethod("updateRangerUrlConfigs"); UpgradeCatalog250 upgradeCatalog250 = createMockBuilder(UpgradeCatalog250.class) .addMockedMethod(updateAmsConfigs) @@ -298,6 +299,7 @@ public class UpgradeCatalog250Test { .addMockedMethod(updateAtlasConfigs) .addMockedMethod(updateLogSearchConfigs) .addMockedMethod(updateAmbariInfraConfigs) + .addMockedMethod(updateRangerUrlConfigs) .createMock(); upgradeCatalog250.updateAMSConfigs(); @@ -333,6 +335,9 @@ public class UpgradeCatalog250Test { upgradeCatalog250.updateAmbariInfraConfigs(); expectLastCall().once(); + upgradeCatalog250.updateRangerUrlConfigs(); + expectLastCall().once(); + upgradeCatalog250.addManageServiceAutoStartPermissions(); expectLastCall().once(); @@ -1128,4 +1133,109 @@ public class UpgradeCatalog250Test { Assert.assertTrue(clusterAdministratorAuthorizations.contains(clusterRunCustomCommandEntity)); } + @Test + public void testUpdateRangerUrlConfigs() throws Exception { + Map<String, String> oldHdfsProperties = new HashMap<String, String>(); + Map<String, String> newHdfsProperties = new HashMap<String, String>(); + oldHdfsProperties.put("ranger.plugin.hdfs.policy.rest.url", "{{policymgr_mgr_url}}"); + newHdfsProperties.put("ranger.plugin.hdfs.policy.rest.url", "http://localhost:6080";); + testUpdateRangerUrl(oldHdfsProperties, newHdfsProperties, "ranger-hdfs-security"); + + Map<String, String> oldHiveProperties = new HashMap<String, String>(); + Map<String, String> newHiveProperties = new HashMap<String, String>(); + oldHiveProperties.put("ranger.plugin.hive.policy.rest.url", "{{policymgr_mgr_url}}"); + newHiveProperties.put("ranger.plugin.hive.policy.rest.url", "http://localhost:6080";); + testUpdateRangerUrl(oldHiveProperties, newHiveProperties, "ranger-hive-security"); + + Map<String, String> oldHbaseProperties = new HashMap<String, String>(); + Map<String, String> newHbaseProperties = new HashMap<String, String>(); + oldHbaseProperties.put("ranger.plugin.hbase.policy.rest.url", "{{policymgr_mgr_url}}"); + newHbaseProperties.put("ranger.plugin.hbase.policy.rest.url", "http://localhost:6080";); + testUpdateRangerUrl(oldHbaseProperties, newHbaseProperties, "ranger-hbase-security"); + + Map<String, String> oldKnoxProperties = new HashMap<String, String>(); + Map<String, String> newKnoxProperties = new HashMap<String, String>(); + oldKnoxProperties.put("ranger.plugin.knox.policy.rest.url", "{{policymgr_mgr_url}}"); + newKnoxProperties.put("ranger.plugin.knox.policy.rest.url", "http://localhost:6080";); + testUpdateRangerUrl(oldKnoxProperties, newKnoxProperties, "ranger-knox-security"); + + Map<String, String> oldStormProperties = new HashMap<String, String>(); + Map<String, String> newStormProperties = new HashMap<String, String>(); + oldStormProperties.put("ranger.plugin.storm.policy.rest.url", "{{policymgr_mgr_url}}"); + newStormProperties.put("ranger.plugin.storm.policy.rest.url", "http://localhost:6080";); + testUpdateRangerUrl(oldStormProperties, newStormProperties, "ranger-storm-security"); + + Map<String, String> oldYarnProperties = new HashMap<String, String>(); + Map<String, String> newYarnProperties = new HashMap<String, String>(); + oldYarnProperties.put("ranger.plugin.yarn.policy.rest.url", "{{policymgr_mgr_url}}"); + newYarnProperties.put("ranger.plugin.yarn.policy.rest.url", "http://localhost:6080";); + testUpdateRangerUrl(oldYarnProperties, newYarnProperties, "ranger-yarn-security"); + + Map<String, String> oldKafkaProperties = new HashMap<String, String>(); + Map<String, String> newKafkaProperties = new HashMap<String, String>(); + oldKafkaProperties.put("ranger.plugin.kafka.policy.rest.url", "{{policymgr_mgr_url}}"); + newKafkaProperties.put("ranger.plugin.kafka.policy.rest.url", "http://localhost:6080";); + testUpdateRangerUrl(oldKafkaProperties, newKafkaProperties, "ranger-kafka-security"); + + Map<String, String> oldAtlasProperties = new HashMap<String, String>(); + Map<String, String> newAtlasProperties = new HashMap<String, String>(); + oldAtlasProperties.put("ranger.plugin.atlas.policy.rest.url", "{{policymgr_mgr_url}}"); + newAtlasProperties.put("ranger.plugin.atlas.policy.rest.url", "http://localhost:6080";); + testUpdateRangerUrl(oldAtlasProperties, newAtlasProperties, "ranger-atlas-security"); + + Map<String, String> oldKmsProperties = new HashMap<String, String>(); + Map<String, String> newKmsProperties = new HashMap<String, String>(); + oldKmsProperties.put("ranger.plugin.kms.policy.rest.url", "{{policymgr_mgr_url}}"); + newKmsProperties.put("ranger.plugin.kms.policy.rest.url", "http://localhost:6080";); + testUpdateRangerUrl(oldKmsProperties, newKmsProperties, "ranger-kms-security"); + } + + public void testUpdateRangerUrl(Map<String, String> oldProperties, Map<String, String> newProperties, String configType) throws Exception { + Map<String, String> adminProperties = new HashMap<String, String>() { + { + put("policymgr_external_url", "http://localhost:6080";); + } + }; + + EasyMockSupport easyMockSupport = new EasyMockSupport(); + + reset(clusters, cluster); + + expect(clusters.getClusters()).andReturn(new HashMap<String, Cluster>() {{ + put("normal", cluster); + }}).once(); + + Config mockRangerPluginConfig = easyMockSupport.createNiceMock(Config.class); + Config mockRangerAdminProperties = easyMockSupport.createNiceMock(Config.class); + + expect(cluster.getDesiredConfigByType("admin-properties")).andReturn(mockRangerAdminProperties).anyTimes(); + expect(mockRangerAdminProperties.getProperties()).andReturn(adminProperties).anyTimes(); + + expect(cluster.getDesiredConfigByType(configType)).andReturn(mockRangerPluginConfig).anyTimes(); + expect(mockRangerPluginConfig.getProperties()).andReturn(oldProperties).anyTimes(); + + replay(clusters, mockRangerPluginConfig, mockRangerAdminProperties, cluster); + + AmbariManagementControllerImpl controller = createMockBuilder(AmbariManagementControllerImpl.class) + .addMockedMethod("createConfiguration") + .addMockedMethod("getClusters", new Class[] { }) + .addMockedMethod("createConfig") + .withConstructor(actionManager, clusters, injector) + .createNiceMock(); + + Injector injector2 = easyMockSupport.createNiceMock(Injector.class); + Capture<Map<String, String>> propertiesCapture = EasyMock.newCapture(); + + expect(injector2.getInstance(AmbariManagementController.class)).andReturn(controller).anyTimes(); + expect(controller.getClusters()).andReturn(clusters).anyTimes(); + expect(controller.createConfig(anyObject(Cluster.class), anyString(), capture(propertiesCapture), anyString(), + EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(config).once(); + + replay(controller, injector2); + new UpgradeCatalog250(injector2).updateRangerUrlConfigs(); + easyMockSupport.verifyAll(); + + Map<String, String> updatedProperties = propertiesCapture.getValue(); + assertTrue(Maps.difference(newProperties, updatedProperties).areEqual()); + } } http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json b/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json index 99d2251..ea00a37 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json @@ -380,10 +380,10 @@ "hive.optimize.mapjoin.mapreduce": "true" }, "ranger-hive-plugin-properties": { - "ranger-hive-plugin-enabled":"yes" + "ranger-hive-plugin-enabled":"No" }, "ranger-knox-plugin-properties": { - "ranger-knox-plugin-enabled":"yes" + "ranger-knox-plugin-enabled":"No" }, "yarn-site": { "yarn.nodemanager.disk-health-checker.min-healthy-disks": "0.25", @@ -626,7 +626,7 @@ "XAAUDIT.SOLR.SOLR_URL": "http://localhost:6083/solr/ranger_audits";, "XAAUDIT.SOLR.IS_ENABLED": "false", "hadoop.rpc.protection": "-", - "ranger-hdfs-plugin-enabled": "Yes", + "ranger-hdfs-plugin-enabled": "No", "SSL_KEYSTORE_FILE_PATH": "/etc/hadoop/conf/ranger-plugin-keystore.jks", "XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS": "60", "policy_user": "ambari-qa", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.0.6/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json index 849b737..2a27eca 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json @@ -534,6 +534,9 @@ "yarn.http.policy": "HTTP_ONLY", "yarn.resourcemanager.webapp.https.address": "c6402.ambari.apache.org:8090" }, + "ranger-yarn-plugin-properties": { + "ranger-yarn-plugin-enabled": "No" + }, "tez-site": { "tez.am.log.level": "WARN", "tez.lib.uris": "hdfs:///apps/tez/,hdfs:///apps/tez/lib/", @@ -582,7 +585,8 @@ "hive_log_dir": "/var/log/hive", "hive_user": "hive", "hcat_log_dir": "/var/log/webhcat", - "hive_database": "New MySQL Database" + "hive_database": "New MySQL Database", + "hive_security_authorization": "None" }, "ranger-env": { "xml_configurations_supported" : "false" @@ -750,7 +754,7 @@ "XAAUDIT.HDFS.IS_ENABLED": "false", "SQL_CONNECTOR_JAR": "{{sql_connector_jar}}", "XAAUDIT.HDFS.LOCAL_BUFFER_FILE": "%time:yyyyMMdd-HHmm.ss%.log", - "ranger-hbase-plugin-enabled": "Yes", + "ranger-hbase-plugin-enabled": "No", "REPOSITORY_NAME": "{{repo_name}}", "SSL_KEYSTORE_PASSWORD": "myKeyFilePassword", "XAAUDIT.DB.IS_ENABLED": "true", @@ -791,7 +795,7 @@ "XAAUDIT.SOLR.SOLR_URL": "http://localhost:6083/solr/ranger_audits";, "XAAUDIT.SOLR.IS_ENABLED": "false", "hadoop.rpc.protection": "-", - "ranger-hdfs-plugin-enabled": "Yes", + "ranger-hdfs-plugin-enabled": "No", "SSL_KEYSTORE_FILE_PATH": "/etc/hadoop/conf/ranger-plugin-keystore.jks", "XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS": "60", "policy_user": "ambari-qa", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json index 5659ba6..8c17e86 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json @@ -532,7 +532,8 @@ "hive_log_dir": "/var/log/hive", "hive_user": "hive", "hcat_log_dir": "/var/log/webhcat", - "hive_database": "New MySQL Database" + "hive_database": "New MySQL Database", + "hive_security_authorization": "None" }, "hbase-env": { "hbase_pid_dir": "/var/run/hbase", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json index 2b92cca..009ff6d 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json @@ -317,7 +317,8 @@ "hive_log_dir": "/var/log/hive", "hive_user": "hive", "hcat_log_dir": "/var/log/webhcat", - "hive_database": "New MySQL Database" + "hive_database": "New MySQL Database", + "hive_security_authorization": "None" }, "cluster-env": { "managed_hdfs_resource_property_names": "", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha_2.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha_2.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha_2.json index acac36f..2b078c3 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha_2.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha_2.json @@ -319,7 +319,8 @@ "hive_log_dir": "/var/log/hive", "hive_user": "hive", "hcat_log_dir": "/var/log/webhcat", - "hive_database": "New MySQL Database" + "hive_database": "New MySQL Database", + "hive_security_authorization": "None" }, "cluster-env": { "managed_hdfs_resource_property_names": "", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_non_hdfs.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_non_hdfs.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_non_hdfs.json index a02a874..571b737 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_non_hdfs.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_non_hdfs.json @@ -569,7 +569,8 @@ "hive_log_dir": "/var/log/hive", "hive_user": "hive", "hcat_log_dir": "/var/log/webhcat", - "hive_database": "New MySQL Database" + "hive_database": "New MySQL Database", + "hive_security_authorization": "None" }, "ranger-env": { "xml_configurations_supported" : "false" http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json index 73c49a1..7fdb449 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json @@ -542,7 +542,8 @@ "hive_log_dir": "/var/log/hive", "hive_user": "hive", "hcat_log_dir": "/var/log/webhcat", - "hive_database": "New MySQL Database" + "hive_database": "New MySQL Database", + "hive_security_authorization": "None" }, "cluster-env": { "managed_hdfs_resource_property_names": "", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.0.6/configs/default_with_bucket.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_with_bucket.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_with_bucket.json index a0e7e9d..5080d30 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_with_bucket.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_with_bucket.json @@ -742,7 +742,7 @@ "XAAUDIT.HDFS.IS_ENABLED": "false", "SQL_CONNECTOR_JAR": "{{sql_connector_jar}}", "XAAUDIT.HDFS.LOCAL_BUFFER_FILE": "%time:yyyyMMdd-HHmm.ss%.log", - "ranger-hbase-plugin-enabled": "Yes", + "ranger-hbase-plugin-enabled": "No", "REPOSITORY_NAME": "{{repo_name}}", "SSL_KEYSTORE_PASSWORD": "myKeyFilePassword", "XAAUDIT.DB.IS_ENABLED": "true", @@ -783,7 +783,7 @@ "XAAUDIT.SOLR.SOLR_URL": "http://localhost:6083/solr/ranger_audits";, "XAAUDIT.SOLR.IS_ENABLED": "false", "hadoop.rpc.protection": "-", - "ranger-hdfs-plugin-enabled": "Yes", + "ranger-hdfs-plugin-enabled": "No", "SSL_KEYSTORE_FILE_PATH": "/etc/hadoop/conf/ranger-plugin-keystore.jks", "XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS": "60", "policy_user": "ambari-qa", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_active_node.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_active_node.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_active_node.json index 0e666ba..841dfda 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_active_node.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_active_node.json @@ -506,7 +506,7 @@ "XAAUDIT.SOLR.SOLR_URL": "http://localhost:6083/solr/ranger_audits";, "XAAUDIT.SOLR.IS_ENABLED": "false", "hadoop.rpc.protection": "-", - "ranger-hdfs-plugin-enabled": "Yes", + "ranger-hdfs-plugin-enabled": "No", "SSL_KEYSTORE_FILE_PATH": "/etc/hadoop/conf/ranger-plugin-keystore.jks", "XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS": "60", "policy_user": "ambari-qa", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node.json index baec1fa..96f4d9d 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node.json @@ -506,7 +506,7 @@ "XAAUDIT.SOLR.SOLR_URL": "http://localhost:6083/solr/ranger_audits";, "XAAUDIT.SOLR.IS_ENABLED": "false", "hadoop.rpc.protection": "-", - "ranger-hdfs-plugin-enabled": "Yes", + "ranger-hdfs-plugin-enabled": "No", "SSL_KEYSTORE_FILE_PATH": "/etc/hadoop/conf/ranger-plugin-keystore.jks", "XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS": "60", "policy_user": "ambari-qa", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start.json index 61b9fe0..de2742f 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start.json @@ -507,7 +507,7 @@ "XAAUDIT.SOLR.SOLR_URL": "http://localhost:6083/solr/ranger_audits";, "XAAUDIT.SOLR.IS_ENABLED": "false", "hadoop.rpc.protection": "-", - "ranger-hdfs-plugin-enabled": "Yes", + "ranger-hdfs-plugin-enabled": "No", "SSL_KEYSTORE_FILE_PATH": "/etc/hadoop/conf/ranger-plugin-keystore.jks", "XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS": "60", "policy_user": "ambari-qa", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start_dfs_nameservices.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start_dfs_nameservices.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start_dfs_nameservices.json index 6b57397..ba0fa8f 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start_dfs_nameservices.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start_dfs_nameservices.json @@ -507,7 +507,7 @@ "XAAUDIT.SOLR.SOLR_URL": "http://localhost:6083/solr/ranger_audits";, "XAAUDIT.SOLR.IS_ENABLED": "false", "hadoop.rpc.protection": "-", - "ranger-hdfs-plugin-enabled": "Yes", + "ranger-hdfs-plugin-enabled": "No", "SSL_KEYSTORE_FILE_PATH": "/etc/hadoop/conf/ranger-plugin-keystore.jks", "XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS": "60", "policy_user": "ambari-qa", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json index 1cdb982..888886e 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json @@ -234,7 +234,7 @@ "hadoop.security.auth_to_local": "\n RULE:[2:$1@$0]([rn]m@.*)s/.*/yarn/\n RULE:[2:$1@$0](jhs@.*)s/.*/mapred/\n RULE:[2:$1@$0]([nd]n@.*)s/.*/hdfs/\n RULE:[2:$1@$0](hm@.*)s/.*/hbase/\n RULE:[2:$1@$0](rs@.*)s/.*/hbase/\n DEFAULT" }, "ranger-hdfs-plugin-properties" : { - "ranger-hdfs-plugin-enabled":"yes" + "ranger-hdfs-plugin-enabled":"No" }, "hdfs-log4j": { "log4j.appender.DRFA.layout": "org.apache.log4j.PatternLayout", @@ -508,7 +508,7 @@ "XAAUDIT.SOLR.SOLR_URL": "http://localhost:6083/solr/ranger_audits";, "XAAUDIT.SOLR.IS_ENABLED": "false", "hadoop.rpc.protection": "-", - "ranger-hdfs-plugin-enabled": "Yes", + "ranger-hdfs-plugin-enabled": "No", "SSL_KEYSTORE_FILE_PATH": "/etc/hadoop/conf/ranger-plugin-keystore.jks", "XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS": "60", "policy_user": "ambari-qa", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json index 15902af..f06fae3 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json @@ -526,7 +526,7 @@ "XAAUDIT.SOLR.SOLR_URL": "http://localhost:6083/solr/ranger_audits";, "XAAUDIT.SOLR.IS_ENABLED": "false", "hadoop.rpc.protection": "-", - "ranger-hdfs-plugin-enabled": "Yes", + "ranger-hdfs-plugin-enabled": "No", "SSL_KEYSTORE_FILE_PATH": "/etc/hadoop/conf/ranger-plugin-keystore.jks", "XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS": "60", "policy_user": "ambari-qa", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json index e6a8676..c5ffcc9 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json @@ -538,7 +538,7 @@ "hbase_java_io_tmpdir" : "/tmp" }, "ranger-hbase-plugin-properties": { - "ranger-hbase-plugin-enabled":"yes" + "ranger-hbase-plugin-enabled":"No" }, "ganglia-env": { "gmond_user": "nobody", @@ -583,7 +583,7 @@ "XAAUDIT.HDFS.IS_ENABLED": "false", "SQL_CONNECTOR_JAR": "{{sql_connector_jar}}", "XAAUDIT.HDFS.LOCAL_BUFFER_FILE": "%time:yyyyMMdd-HHmm.ss%.log", - "ranger-hbase-plugin-enabled": "Yes", + "ranger-hbase-plugin-enabled": "No", "REPOSITORY_NAME": "{{repo_name}}", "SSL_KEYSTORE_PASSWORD": "myKeyFilePassword", "XAAUDIT.DB.IS_ENABLED": "true", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2-phoenix.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2-phoenix.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2-phoenix.json index b1d603b..114bdff 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2-phoenix.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2-phoenix.json @@ -539,7 +539,7 @@ "hbase_java_io_tmpdir" : "/tmp" }, "ranger-hbase-plugin-properties": { - "ranger-hbase-plugin-enabled":"yes" + "ranger-hbase-plugin-enabled":"No" }, "ganglia-env": { "gmond_user": "nobody", @@ -584,7 +584,7 @@ "XAAUDIT.HDFS.IS_ENABLED": "false", "SQL_CONNECTOR_JAR": "{{sql_connector_jar}}", "XAAUDIT.HDFS.LOCAL_BUFFER_FILE": "%time:yyyyMMdd-HHmm.ss%.log", - "ranger-hbase-plugin-enabled": "Yes", + "ranger-hbase-plugin-enabled": "No", "REPOSITORY_NAME": "{{repo_name}}", "SSL_KEYSTORE_PASSWORD": "myKeyFilePassword", "XAAUDIT.DB.IS_ENABLED": "true", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json index 435291a..d82ca99 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json @@ -538,7 +538,7 @@ "hbase_java_io_tmpdir" : "/tmp" }, "ranger-hbase-plugin-properties": { - "ranger-hbase-plugin-enabled":"yes" + "ranger-hbase-plugin-enabled":"No" }, "ganglia-env": { "gmond_user": "nobody", @@ -583,7 +583,7 @@ "XAAUDIT.HDFS.IS_ENABLED": "false", "SQL_CONNECTOR_JAR": "{{sql_connector_jar}}", "XAAUDIT.HDFS.LOCAL_BUFFER_FILE": "%time:yyyyMMdd-HHmm.ss%.log", - "ranger-hbase-plugin-enabled": "Yes", + "ranger-hbase-plugin-enabled": "No", "REPOSITORY_NAME": "{{repo_name}}", "SSL_KEYSTORE_PASSWORD": "myKeyFilePassword", "XAAUDIT.DB.IS_ENABLED": "true", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.0.6/configs/nn_ru_lzo.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/nn_ru_lzo.json b/ambari-server/src/test/python/stacks/2.0.6/configs/nn_ru_lzo.json index 9f0c236..f4b8a70 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/nn_ru_lzo.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/nn_ru_lzo.json @@ -183,7 +183,7 @@ "XAAUDIT.SOLR.SOLR_URL": "http://localhost:6083/solr/ranger_audits";, "XAAUDIT.SOLR.IS_ENABLED": "false", "hadoop.rpc.protection": "-", - "ranger-hdfs-plugin-enabled": "Yes", + "ranger-hdfs-plugin-enabled": "No", "SSL_KEYSTORE_FILE_PATH": "/etc/hadoop/conf/ranger-plugin-keystore.jks", "XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS": "60", "policy_user": "ambari-qa", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json index 3367e1b..5327865 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json @@ -387,7 +387,7 @@ "ipc.client.connection.maxidletime": "30000" }, "ranger-hdfs-plugin-properties" : { - "ranger-hdfs-plugin-enabled":"yes" + "ranger-hdfs-plugin-enabled":"No" }, "ranger-hive-plugin-properties": { "XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS": "900", @@ -592,6 +592,9 @@ "yarn.http.policy": "HTTP_ONLY", "yarn.resourcemanager.webapp.https.address": "c6402.ambari.apache.org:8090" }, + "ranger-yarn-plugin-properties" : { + "ranger-yarn-plugin-enabled":"No" + }, "yarn-env": { "yarn_pid_dir_prefix": "/var/run/hadoop-yarn", "apptimelineserver_heapsize": "1024", @@ -649,7 +652,8 @@ "hive_log_dir": "/var/log/hive", "hive_user": "hive", "hcat_log_dir": "/var/log/webhcat", - "hive_database": "New MySQL Database" + "hive_database": "New MySQL Database", + "hive_security_authorization": "None" }, "hbase-env": { "hbase_pid_dir": "/var/run/hbase", @@ -771,7 +775,7 @@ "XAAUDIT.HDFS.IS_ENABLED": "false", "SQL_CONNECTOR_JAR": "{{sql_connector_jar}}", "XAAUDIT.HDFS.LOCAL_BUFFER_FILE": "%time:yyyyMMdd-HHmm.ss%.log", - "ranger-hbase-plugin-enabled": "Yes", + "ranger-hbase-plugin-enabled": "No", "REPOSITORY_NAME": "{{repo_name}}", "SSL_KEYSTORE_PASSWORD": "myKeyFilePassword", "XAAUDIT.DB.IS_ENABLED": "true", @@ -812,7 +816,7 @@ "XAAUDIT.SOLR.SOLR_URL": "http://localhost:6083/solr/ranger_audits";, "XAAUDIT.SOLR.IS_ENABLED": "false", "hadoop.rpc.protection": "-", - "ranger-hdfs-plugin-enabled": "Yes", + "ranger-hdfs-plugin-enabled": "No", "SSL_KEYSTORE_FILE_PATH": "/etc/hadoop/conf/ranger-plugin-keystore.jks", "XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS": "60", "policy_user": "ambari-qa", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json index 699c1f5..bf4ff12 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json @@ -585,7 +585,8 @@ "hive_log_dir": "/var/log/hive", "hive_user": "hive", "hcat_log_dir": "/var/log/webhcat", - "hive_database": "New MySQL Database" + "hive_database": "New MySQL Database", + "hive_security_authorization": "None" }, "hbase-env": { "hbase_pid_dir": "/var/run/hbase", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json b/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json index 92a7516..27cb63e 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json +++ b/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json @@ -235,7 +235,7 @@ "XAAUDIT.DB.DATABASE_NAME": "{{xa_audit_db_name}}", "XAAUDIT.DB.HOSTNAME": "{{xa_db_host}}", "XAAUDIT.SOLR.IS_ENABLED": "false", - "ranger-storm-plugin-enabled": "Yes", + "ranger-storm-plugin-enabled": "No", "SSL_KEYSTORE_FILE_PATH": "/etc/hadoop/conf/ranger-plugin-keystore.jks", "XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS": "60", "XAAUDIT.DB.USER_NAME": "{{xa_audit_db_user}}", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.1/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/default.json b/ambari-server/src/test/python/stacks/2.1/configs/default.json index 6ee7612..e04e1eb 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.1/configs/default.json @@ -254,7 +254,7 @@ "XAAUDIT.DB.DATABASE_NAME": "{{xa_audit_db_name}}", "XAAUDIT.DB.HOSTNAME": "{{xa_db_host}}", "XAAUDIT.SOLR.IS_ENABLED": "false", - "ranger-storm-plugin-enabled": "Yes", + "ranger-storm-plugin-enabled": "No", "SSL_KEYSTORE_FILE_PATH": "/etc/hadoop/conf/ranger-plugin-keystore.jks", "XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS": "60", "XAAUDIT.DB.USER_NAME": "{{xa_audit_db_user}}", @@ -649,7 +649,8 @@ "hive_log_dir": "/var/log/hive", "hive_user": "hive", "hcat_log_dir": "/var/log/webhcat", - "hive_database": "New MySQL Database" + "hive_database": "New MySQL Database", + "hive_security_authorization": "None" }, "hbase-env": { "hbase_pid_dir": "/var/run/hbase", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json b/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json index 9bd239c..1b027b7 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json +++ b/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json @@ -246,7 +246,7 @@ "XAAUDIT.DB.DATABASE_NAME": "{{xa_audit_db_name}}", "XAAUDIT.DB.HOSTNAME": "{{xa_db_host}}", "XAAUDIT.SOLR.IS_ENABLED": "false", - "ranger-storm-plugin-enabled": "Yes", + "ranger-storm-plugin-enabled": "No", "SSL_KEYSTORE_FILE_PATH": "/etc/hadoop/conf/ranger-plugin-keystore.jks", "XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS": "60", "XAAUDIT.DB.USER_NAME": "{{xa_audit_db_user}}", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.1/configs/secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/secured.json b/ambari-server/src/test/python/stacks/2.1/configs/secured.json index 0e4bfc3..61b359c 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/secured.json +++ b/ambari-server/src/test/python/stacks/2.1/configs/secured.json @@ -102,7 +102,7 @@ "XAAUDIT.DB.DATABASE_NAME": "{{xa_audit_db_name}}", "XAAUDIT.DB.HOSTNAME": "{{xa_db_host}}", "XAAUDIT.SOLR.IS_ENABLED": "false", - "ranger-storm-plugin-enabled": "Yes", + "ranger-storm-plugin-enabled": "No", "SSL_KEYSTORE_FILE_PATH": "/etc/hadoop/conf/ranger-plugin-keystore.jks", "XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS": "60", "XAAUDIT.DB.USER_NAME": "{{xa_audit_db_user}}", @@ -640,7 +640,8 @@ "hive_log_dir": "/var/log/hive", "hive_user": "hive", "hcat_log_dir": "/var/log/webhcat", - "hive_database": "New MySQL Database" + "hive_database": "New MySQL Database", + "hive_security_authorization": "None" }, "hbase-env": { "hbase_pid_dir": "/var/run/hbase", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py index de8f2b0..8a82c99 100644 --- a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py +++ b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py @@ -3656,7 +3656,18 @@ class TestHDP22StackAdvisor(TestCase): } ] - res = self.stackAdvisor.validateHiveConfigurationsEnv(properties, {}, configurations, {}, {}) + services = { + "services": + [ + { + "StackServices": { + "service_name" : "RANGER" + } + } + ] + } + + res = self.stackAdvisor.validateHiveConfigurationsEnv(properties, {}, configurations, services, {}) self.assertEquals(res, res_expected) # 2) fail: hive_security_authorization=Ranger but ranger plugin is disabled in ranger-env @@ -3674,6 +3685,14 @@ class TestHDP22StackAdvisor(TestCase): } } services = { + "services": + [ + { + "StackServices": { + "service_name" : "RANGER" + } + } + ], "configurations": configurations } res_expected = [] @@ -3946,6 +3965,14 @@ class TestHDP22StackAdvisor(TestCase): } } services = { + "services": + [ + { + "StackServices": { + "service_name" : "RANGER" + } + } + ], "configurations": configurations } res_expected = [] @@ -3982,6 +4009,14 @@ class TestHDP22StackAdvisor(TestCase): } } services = { + "services": + [ + { + "StackServices": { + "service_name" : "RANGER" + } + } + ], "configurations": configurations } res_expected = [] @@ -4018,6 +4053,14 @@ class TestHDP22StackAdvisor(TestCase): } } services = { + "services": + [ + { + "StackServices": { + "service_name" : "RANGER" + } + } + ], "configurations": configurations } res_expected = [] @@ -4054,6 +4097,14 @@ class TestHDP22StackAdvisor(TestCase): } } services = { + "services": + [ + { + "StackServices": { + "service_name" : "RANGER" + } + } + ], "configurations": configurations } res_expected = [] http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.2/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/default.json b/ambari-server/src/test/python/stacks/2.2/configs/default.json index 7583e27..bcb021b 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/default.json @@ -211,7 +211,7 @@ "XAAUDIT.DB.HOSTNAME": "{{xa_db_host}}", "XAAUDIT.SOLR.IS_ENABLED": "false", "SSL_KEYSTORE_FILE_PATH": "/etc/hadoop/conf/ranger-plugin-keystore.jks", - "ranger-knox-plugin-enabled": "Yes", + "ranger-knox-plugin-enabled": "No", "XAAUDIT.DB.USER_NAME": "{{xa_audit_db_user}}", "policy_user": "ambari-qa", "XAAUDIT.HDFS.DESTINTATION_FILE": "%hostname%-audit.log", @@ -333,10 +333,10 @@ "log.retention.hours": "168" }, "ranger-hbase-plugin-properties": { - "ranger-hbase-plugin-enabled":"yes" + "ranger-hbase-plugin-enabled":"No" }, "ranger-hive-plugin-properties": { - "ranger-hive-plugin-enabled":"yes" + "ranger-hive-plugin-enabled":"No" }, "accumulo-env": { "accumulo_user": "accumulo", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json index cb476d3..7a29ea0 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json @@ -500,7 +500,8 @@ "hive_log_dir": "/var/log/hive", "hive_user": "hive", "hcat_log_dir": "/var/log/webhcat", - "hive_database": "New MySQL Database" + "hive_database": "New MySQL Database", + "hive_security_authorization": "None" }, "webhcat-site": { "templeton.pig.path": "pig.tar.gz/pig/bin/pig", http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py index 295aee8..2149877 100644 --- a/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py +++ b/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py @@ -1557,7 +1557,8 @@ class TestHDP23StackAdvisor(TestCase): 'properties': { 'ranger-storm-plugin-enabled': 'No', } - } + }, + 'ranger-knox-security': {'properties': {}} } recommendedConfigurations = {} http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.5/configs/hsi_default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.5/configs/hsi_default.json b/ambari-server/src/test/python/stacks/2.5/configs/hsi_default.json index ffdd5e9..6531750 100644 --- a/ambari-server/src/test/python/stacks/2.5/configs/hsi_default.json +++ b/ambari-server/src/test/python/stacks/2.5/configs/hsi_default.json @@ -618,7 +618,8 @@ "hive_log_dir": "/var/log/hive", "hive_user": "hive", "hcat_log_dir": "/var/log/webhcat", - "hive_database": "New MySQL Database" + "hive_database": "New MySQL Database", + "hive_security_authorization": "None" }, "ranger-env": { "xml_configurations_supported" : "false" http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-server/src/test/python/stacks/2.5/configs/hsi_ha.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.5/configs/hsi_ha.json b/ambari-server/src/test/python/stacks/2.5/configs/hsi_ha.json index def0e54..10d1d99 100644 --- a/ambari-server/src/test/python/stacks/2.5/configs/hsi_ha.json +++ b/ambari-server/src/test/python/stacks/2.5/configs/hsi_ha.json @@ -617,7 +617,8 @@ "hive_log_dir": "/var/log/hive", "hive_user": "hive", "hcat_log_dir": "/var/log/webhcat", - "hive_database": "New MySQL Database" + "hive_database": "New MySQL Database", + "hive_security_authorization": "None" }, "ranger-env": { "xml_configurations_supported" : "false" http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-web/app/controllers/main/service/info/configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js index 60a0e02..d946ea0 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -514,12 +514,12 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.AddSecurityConfi var selectedService = this.get('stepConfigs').findProperty('serviceName', this.get('content.serviceName')); this.set('selectedService', selectedService); this.checkOverrideProperty(selectedService); - if (App.Service.find().someProperty('serviceName', 'RANGER')) { + /* if (App.Service.find().someProperty('serviceName', 'RANGER')) { App.router.get('mainServiceInfoSummaryController').updateRangerPluginsStatus(); this.setVisibilityForRangerProperties(selectedService); } else { App.config.removeRangerConfigs(this.get('stepConfigs')); - } + } */ this.loadConfigRecommendations(null, this._onLoadComplete.bind(this)); App.loadTimer.finish('Service Configs Page'); }, http://git-wip-us.apache.org/repos/asf/ambari/blob/1524fd77/ambari-web/app/controllers/wizard/step7_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js index 2d83bca..61fd910 100644 --- a/ambari-web/app/controllers/wizard/step7_controller.js +++ b/ambari-web/app/controllers/wizard/step7_controller.js @@ -535,10 +535,10 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E this.set('stepConfigs', serviceConfigs); this.checkHostOverrideInstaller(); this.selectProperService(); - var rangerService = App.StackService.find().findProperty('serviceName', 'RANGER'); + /* var rangerService = App.StackService.find().findProperty('serviceName', 'RANGER'); if (rangerService && !rangerService.get('isInstalled') && !rangerService.get('isSelected')) { App.config.removeRangerConfigs(this.get('stepConfigs')); - } + } */ console.timeEnd('applyServicesConfigs execution time: '); console.time('loadConfigRecommendations execution time: '); this.loadConfigRecommendations(null, this.completeConfigLoading.bind(this));
