Repository: ambari Updated Branches: refs/heads/trunk 1884cd12c -> f9cefd231
AMBARI-11130. "yarn.node-labels.manager-class" still present during cluster deploy and on deployed cluster (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f9cefd23 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f9cefd23 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f9cefd23 Branch: refs/heads/trunk Commit: f9cefd23197d317b0ed06c8d04ae2eb3c1667149 Parents: 1884cd1 Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Thu May 14 17:02:48 2015 +0300 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Thu May 14 17:02:48 2015 +0300 ---------------------------------------------------------------------- .../services/OOZIE/configuration/oozie-site.xml | 166 ------------------- .../services/YARN/configuration/yarn-site.xml | 29 ++++ 2 files changed, 29 insertions(+), 166 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f9cefd23/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/configuration/oozie-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/configuration/oozie-site.xml deleted file mode 100644 index dc95b6f..0000000 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/configuration/oozie-site.xml +++ /dev/null @@ -1,166 +0,0 @@ -<?xml version="1.0"?> -<!-- - 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 supports_final="true" supports_do_not_extend="true"> - - <property> - <name>oozie.authentication.kerberos.name.rules</name> - <value> - RULE:[2:$1@$0]([jt]t@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-MAPREDUSER/ - RULE:[2:$1@$0]([nd]n@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HDFSUSER/ - RULE:[2:$1@$0](hm@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/ - RULE:[2:$1@$0](rs@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/ - DEFAULT - </value> - <description>The mapping from kerberos principal names to local OS user names.</description> - </property> - - <property> - <name>oozie.authentication.type</name> - <value>simple</value> - <description> - Authentication used for Oozie HTTP endpoint, the supported values are: simple | kerberos | - #AUTHENTICATION_HANDLER_CLASSNAME#. - </description> - </property> - - <property> - <name>oozie.base.url</name> - <value>http://localhost:11000/oozie</value> - <description>Base Oozie URL.</description> - </property> - - <property> - <name>oozie.credentials.credentialclasses</name> - <value>hcat=org.apache.oozie.action.hadoop.HCatCredentials</value> - <description> - Credential Class to be used for HCat. - </description> - </property> - - <property> - <name>oozie.service.AuthorizationService.authorization.enabled</name> - <value>false</value> - <description> - Specifies whether security (user name/admin role) is enabled or not. - If disabled any user can manage Oozie system and manage any job. - </description> - </property> - - <property> - <name>oozie.service.HadoopAccessorService.hadoop.configurations</name> - <value>*=/etc/hadoop/conf</value> - <description> - Comma separated AUTHORITY=HADOOP_CONF_DIR, where AUTHORITY is the HOST:PORT of - the Hadoop service (JobTracker, HDFS). The wildcard '*' configuration is - used when there is no exact match for an authority. The HADOOP_CONF_DIR contains - the relevant Hadoop *-site.xml files. If the path is relative is looked within - the Oozie configuration directory; though the path can be absolute (i.e. to point - to Hadoop client conf/ directories in the local filesystem. - </description> - </property> - - <property> - <name>oozie.service.HadoopAccessorService.kerberos.enabled</name> - <value>false</value> - <description> - Indicates if Oozie is configured to use Kerberos. - </description> - </property> - - <property> - <name>oozie.service.URIHandlerService.uri.handlers</name> - <value>org.apache.oozie.dependency.FSURIHandler,org.apache.oozie.dependency.HCatURIHandler</value> - <description> - Enlist the different uri handlers supported for data availability checks. - </description> - </property> - - <property> - <name>oozie.services.ext</name> - <value>org.apache.oozie.service.JMSAccessorService,org.apache.oozie.service.PartitionDependencyManagerService,org.apache.oozie.service.HCatAccessorService - </value> - <description> - To add/replace services defined in 'oozie.services' with custom implementations. - Class names must be separated by commas. - </description> - </property> - - <property> - <name>oozie.db.schema.name</name> - <value>oozie</value> - <description> - Oozie DataBase Name - </description> - </property> - - <property> - <name>oozie.service.JPAService.jdbc.username</name> - <value>oozie</value> - <description> - Database user name to use to connect to the database - </description> - </property> - - <property require-input = "true"> - <name>oozie.service.JPAService.jdbc.password</name> - <value> </value> - <property-type>PASSWORD</property-type> - <description> - DB user password. - - IMPORTANT: if password is emtpy leave a 1 space string, the service trims the value, - if empty Configuration assumes it is NULL. - </description> - </property> - - <property> - <name>oozie.service.JPAService.jdbc.driver</name> - <value>org.apache.derby.jdbc.EmbeddedDriver</value> - <description> - JDBC driver class. - </description> - </property> - - <property> - <name>oozie.service.JPAService.jdbc.url</name> - <value>jdbc:derby:${oozie.data.dir}/${oozie.db.schema.name}-db;create=true</value> - <description> - JDBC URL. - </description> - </property> - - <property> - <name>oozie.service.AuthorizationService.security.enabled</name> - <value>true</value> - <description> - Specifies whether security (user name/admin role) is enabled or not. - If disabled any user can manage Oozie system and manage any job. - </description> - </property> - - <property> - <name>oozie.authentication.simple.anonymous.allowed</name> - <value>false</value> - <description> - Indicates if anonymous requests are allowed when using 'simple' authentication. - </description> - </property> - -</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/f9cefd23/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml new file mode 100644 index 0000000..852c192 --- /dev/null +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml @@ -0,0 +1,29 @@ +<?xml version="1.0"?> +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> +<!-- + 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. +--> + +<!-- Put site-specific property overrides in this file. --> + +<configuration supports_final="true" xmlns:xi="http://www.w3.org/2001/XInclude";> + + <property> + <name>yarn.node-labels.manager-class</name> + <deleted>true</deleted> + </property> + +</configuration> \ No newline at end of file
