ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [19/47] ambari git commit: AMBARI-18826. Stack property definitions made in ambari-web should be made stack agnostic (akovalenko)
Date Mon, 28 Nov 2016 13:39:11 GMT
AMBARI-18826. Stack property definitions made in ambari-web should be made stack agnostic (akovalenko)


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 2ce9e3b671ad1687581113dd96fa38be7a0c51a3
Parents: 1ed9416
Author: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Authored: Tue Nov 22 17:48:27 2016 +0200
Committer: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Committed: Tue Nov 22 17:48:27 2016 +0200

----------------------------------------------------------------------
 ambari-web/app/assets/test/tests.js             |    5 +-
 .../hawq/activateStandby/step2_controller.js    |    2 +-
 .../hawq/addStandby/step3_controller.js         |    3 +-
 .../journalNode/step2_controller.js             |    3 +-
 .../nameNode/step3_controller.js                |    3 +-
 .../resourceManager/step3_controller.js         |    2 +-
 ambari-web/app/controllers/main/host/details.js |    2 +-
 .../app/controllers/wizard/step7_controller.js  |    2 +-
 .../app/controllers/wizard/step8_controller.js  |    2 +-
 ambari-web/app/data/HDP2.2/hive_properties.js   |  119 -
 ambari-web/app/data/HDP2.2/site_properties.js   |  275 --
 ambari-web/app/data/HDP2.2/tez_properties.js    |   43 -
 ambari-web/app/data/HDP2.2/yarn_properties.js   |   54 -
 .../HDP2.3/hawq_activate_standby_properties.js  |   43 -
 .../app/data/HDP2.3/hawq_ha_properties.js       |   43 -
 ambari-web/app/data/HDP2.3/site_properties.js   |  373 ---
 ambari-web/app/data/HDP2/alert_notification.js  |  145 -
 .../app/data/HDP2/gluster_fs_properties.js      |   94 -
 ambari-web/app/data/HDP2/ha_properties.js       |  538 ----
 .../data/HDP2/kerberos_descriptor_properties.js |   35 -
 ambari-web/app/data/HDP2/kerberos_identities.js |  129 -
 .../data/HDP2/move_journal_node_properties.js   |   42 -
 ambari-web/app/data/HDP2/rm_ha_properties.js    |  206 --
 ambari-web/app/data/HDP2/secure_mapping.js      | 1004 -------
 ambari-web/app/data/HDP2/site_properties.js     | 2579 ------------------
 ambari-web/app/data/HDP2/ui_properties.js       |   49 -
 .../app/data/configs/alert_notification.js      |  145 +
 .../configs/services/accumulo_properties.js     |  116 +
 .../configs/services/ambari_infra_properties.js |  167 ++
 .../services/ambari_metrics_properties.js       |  188 ++
 .../data/configs/services/falcon_properties.js  |  302 ++
 .../data/configs/services/flume_properties.js   |   38 +
 .../configs/services/glusterfs_properties.js    |   93 +
 .../data/configs/services/hawq_properties.js    |  110 +
 .../data/configs/services/hbase_properties.js   |  124 +
 .../data/configs/services/hdfs_properties.js    |  164 ++
 .../data/configs/services/hive_properties.js    |  590 ++++
 .../data/configs/services/kafka_properties.js   |   66 +
 .../configs/services/kerberos_properties.js     |  204 ++
 .../data/configs/services/knox_properties.js    |   32 +
 .../configs/services/logsearch_properties.js    |  447 +++
 .../configs/services/mapreduce2_properties.js   |   45 +
 .../data/configs/services/oozie_properties.js   |   93 +
 .../data/configs/services/ranger_properties.js  |  309 +++
 .../data/configs/services/storm_properties.js   |  296 ++
 .../app/data/configs/services/tez_properties.js |   92 +
 .../data/configs/services/yarn_properties.js    |  300 ++
 .../configs/services/zookeeper_properties.js    |   67 +
 ambari-web/app/data/configs/site_properties.js  |   55 +
 ambari-web/app/data/configs/ui_properties.js    |   49 +
 .../app/data/configs/wizards/ha_properties.js   |  538 ++++
 .../wizards/hawq_activate_standby_properties.js |   43 +
 .../data/configs/wizards/hawq_ha_properties.js  |   43 +
 .../wizards/kerberos_descriptor_properties.js   |   35 +
 .../data/configs/wizards/kerberos_identities.js |  129 +
 .../wizards/move_journal_node_properties.js     |   42 +
 .../data/configs/wizards/rm_ha_properties.js    |  206 ++
 .../app/data/configs/wizards/secure_mapping.js  | 1004 +++++++
 ambari-web/app/data/custom_stack_map.js         |    2 -
 .../configs/stack_config_properties_mapper.js   |    2 +-
 .../app/mixins/wizard/addSecurityConfigs.js     |    2 +-
 ambari-web/app/models/stack_service.js          |   13 +-
 ambari-web/app/utils/config.js                  |   25 +-
 ambari-web/app/views/common/controls_view.js    |    5 +-
 .../views/main/dashboard/widgets/hbase_links.js |    6 +-
 .../views/main/service/reassign/step5_view.js   |    3 +-
 ambari-web/copy-pluggable-stack-resources.sh    |    2 +-
 .../test/controllers/main/host/details_test.js  |   25 +-
 .../test/data/HDP2.2/site_properties_test.js    |   76 -
 .../test/data/HDP2.3/site_properties_test.js    |   77 -
 .../test/data/HDP2/secure_mapping_test.js       |   36 -
 .../test/data/HDP2/site_properties_test.js      |   76 -
 .../test/data/configs/site_properties_test.js   |   76 +
 .../data/configs/wizards/secure_mapping_test.js |   36 +
 ambari-web/test/utils/config_test.js            |   46 +-
 75 files changed, 6305 insertions(+), 6130 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/assets/test/tests.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/test/tests.js b/ambari-web/app/assets/test/tests.js
index 6a71db6..959d1c6 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -38,10 +38,7 @@ var files = [
   'test/init_computed_aliases',
   'test/init_model_test',
   'test/app_test',
-  'test/data/HDP2/site_properties_test',
-  'test/data/HDP2/secure_mapping_test',
-  'test/data/HDP2.2/site_properties_test',
-  'test/data/HDP2.3/site_properties_test',
+  'test/data/configs/site_properties_test',
   'test/controllers/global/background_operations_test',
   'test/controllers/global/cluster_controller_test',
   'test/controllers/global/update_controller_test',

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/controllers/main/admin/highAvailability/hawq/activateStandby/step2_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/hawq/activateStandby/step2_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/hawq/activateStandby/step2_controller.js
index ff338de..c8f0e15 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/hawq/activateStandby/step2_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/hawq/activateStandby/step2_controller.js
@@ -46,7 +46,7 @@ App.ActivateHawqStandbyWizardStep2Controller = Em.Controller.extend({
   renderConfigs: function () {
     newHawqMaster = App.HostComponent.find().findProperty('componentName','HAWQSTANDBY').get('hostName');
 
-    var configs = require('data/HDP2.3/hawq_activate_standby_properties').haConfig;
+    var configs = require('data/configs/wizards/hawq_activate_standby_properties').haConfig;
 
     var serviceConfig = App.ServiceConfig.create({
       serviceName: configs.serviceName,

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js
index 3378cd5..81ece37 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js
@@ -60,7 +60,7 @@ App.AddHawqStandbyWizardStep3Controller = Em.Controller.extend({
    */
   renderConfigs: function () {
 
-    var configs = require('data/HDP2.3/hawq_ha_properties').haConfig;
+    var configs = require('data/configs/wizards/hawq_ha_properties').haConfig;
 
     var serviceConfig = App.ServiceConfig.create({
       serviceName: configs.serviceName,
@@ -157,4 +157,3 @@ App.AddHawqStandbyWizardStep3Controller = Em.Controller.extend({
   },
 
 });
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step2_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step2_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step2_controller.js
index 9804428..d1cb198 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step2_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step2_controller.js
@@ -35,7 +35,7 @@ App.ManageJournalNodeWizardStep2Controller = Em.Controller.extend({
   selectedService: null,
   stepConfigs: [],
   serverConfigData: {},
-  moveJNConfig: $.extend(true, {}, require('data/HDP2/move_journal_node_properties').moveJNConfig),
+  moveJNConfig: $.extend(true, {}, require('data/configs/wizards/move_journal_node_properties').moveJNConfig),
   once: false,
   isLoaded: false,
   versionLoaded: true,
@@ -161,4 +161,3 @@ App.ManageJournalNodeWizardStep2Controller = Em.Controller.extend({
   isNextDisabled: Em.computed.not('isLoaded')
 
 });
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js
index 1e80e72..0a46af7 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js
@@ -35,7 +35,7 @@ App.HighAvailabilityWizardStep3Controller = Em.Controller.extend({
   selectedService: null,
   stepConfigs: [],
   serverConfigData: {},
-  haConfig: $.extend(true, {}, require('data/HDP2/ha_properties').haConfig),
+  haConfig: $.extend(true, {}, require('data/configs/wizards/ha_properties').haConfig),
   once: false,
   isLoaded: false,
   versionLoaded: true,
@@ -339,4 +339,3 @@ App.HighAvailabilityWizardStep3Controller = Em.Controller.extend({
   isNextDisabled: Em.computed.not('isLoaded')
 
 });
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js
index 08e0b73..179193f 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js
@@ -49,7 +49,7 @@ App.RMHighAvailabilityWizardStep3Controller = Em.Controller.extend(App.Blueprint
    */
   renderConfigs: function () {
 
-    var configs = $.extend(true, {}, require('data/HDP2/rm_ha_properties').haConfig);
+    var configs = $.extend(true, {}, require('data/configs/wizards/rm_ha_properties').haConfig);
 
     var serviceConfig = App.ServiceConfig.create({
       serviceName: configs.serviceName,

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/controllers/main/host/details.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/host/details.js b/ambari-web/app/controllers/main/host/details.js
index ec9a73f..ecb3219 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -1257,7 +1257,7 @@ App.MainHostDetailsController = Em.Controller.extend(App.SupportClientConfigsDow
    * @method updateStormConfigs
    */
   updateStormConfigs: function () {
-    if (App.Service.find('STORM').get('isLoaded') && App.get('isHadoop23Stack')) {
+    if (App.Service.find('STORM').get('isLoaded') && App.StackService.find('STORM').compareCurrentVersion('0.10') > -1) {
       this.loadConfigs("loadStormConfigs");
     }
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/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 3d22fe9..d43b69b 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -68,7 +68,7 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
   /**
    * used in services_config.js view to mark a config with security icon
    */
-  secureConfigs: require('data/HDP2/secure_mapping'),
+  secureConfigs: require('data/configs/wizards/secure_mapping'),
 
   /**
    * If configChangeObserver Modal is shown

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index 24d8ec7..6475d49 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1655,7 +1655,7 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
     var miscConfigs = this.get('configs').filterProperty('serviceName', 'MISC'),
       createNotification = miscConfigs.findProperty('name', 'create_notification').value;
     if (createNotification !== 'yes') return;
-      var predefinedNotificationConfigNames = require('data/HDP2/alert_notification').mapProperty('name'),
+      var predefinedNotificationConfigNames = require('data/configs/alert_notification').mapProperty('name'),
       configsForNotification = this.get('configs').filterProperty('filename', 'alert_notification');
     var properties = {},
       names = [

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/data/HDP2.2/hive_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.2/hive_properties.js b/ambari-web/app/data/HDP2.2/hive_properties.js
deleted file mode 100644
index 1cdd5a2..0000000
--- a/ambari-web/app/data/HDP2.2/hive_properties.js
+++ /dev/null
@@ -1,119 +0,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.
- */
-
-var App = require('app');
-
-var hivePropsByCategory = {
-
-  'Performance': [
-    'hive.cbo.enable',
-    'hive.optimize.reducededuplication.min.reducer',
-    'hive.optimize.reducededuplication',
-    'hive.orc.splits.include.file.footer',
-    'hive.merge.mapfiles',
-    'hive.merge.mapredfiles',
-    'hive.merge.tezfiles',
-    'hive.merge.smallfiles.avgsize',
-    'hive.merge.size.per.task',
-    'hive.merge.orcfile.stripe.level',
-    'hive.auto.convert.join',
-    'hive.auto.convert.join.noconditionaltask',
-    'hive.auto.convert.join.noconditionaltask.size',
-    'hive.optimize.bucketmapjoin.sortedmerge',
-    'hive.tez.smb.number.waves',
-    'hive.map.aggr.hash.percentmemory',
-    'hive.map.aggr',
-    'hive.optimize.sort.dynamic.partition',
-    'hive.stats.autogather',
-    'hive.stats.fetch.column.stats',
-    'hive.vectorized.execution.enabled',
-    'hive.vectorized.execution.reduce.enabled',
-    'hive.vectorized.groupby.checkinterval',
-    'hive.vectorized.groupby.flush.percent',
-    'hive.limit.pushdown.memory.usage',
-    'hive.optimize.index.filter',
-    'hive.exec.reducers.bytes.per.reducer',
-    'hive.smbjoin.cache.rows',
-    'hive.exec.orc.default.stripe.size',
-    'hive.fetch.task.conversion',
-    'hive.fetch.task.conversion.threshold',
-    'hive.fetch.task.aggr',
-    'hive.compute.query.using.stats',
-    'hive.tez.auto.reducer.parallelism',
-    'hive.tez.max.partition.factor',
-    'hive.tez.min.partition.factor',
-    'hive.tez.dynamic.partition.pruning',
-    'hive.tez.dynamic.partition.pruning.max.event.size',
-    'hive.tez.dynamic.partition.pruning.max.data.size'
-  ],
-
-  'General': [
-    'hive.exec.pre.hooks',
-    'hive.exec.post.hooks',
-    'hive.exec.failure.hooks',
-    'hive.execution.engine',
-    'hive.exec.dynamic.partition',
-    'hive.exec.dynamic.partition.mode',
-    'hive.exec.max.dynamic.partitions',
-    'hive.exec.max.dynamic.partitions.pernode',
-    'hive.exec.max.created.files',
-    'hive.enforce.bucketing',
-    'datanucleus.cache.level2.type',
-    'hive.metastore.uris',
-    'hive.metastore.warehouse.dir',
-    'hive.exec.parallel.thread.number',
-    'hive.security.authorization.enabled',
-    'hive.security.authorization.manager',
-    'hive.security.metastore.authenticator.manager',
-    'hive.security.metastore.authorization.manager',
-    'hive.server2.authentication',
-    'hive.server2.enable.doAs',
-    'hive.server2.tez.default.queues',
-    'hive.server2.tez.initialize.default.sessions',
-    'hive.server2.tez.sessions.per.default.queue',
-    'hive.server2.thrift.http.path',
-    'hive.server2.thrift.http.port',
-    'hive.server2.thrift.max.worker.threads',
-    'hive.server2.thrift.port',
-    'hive.server2.thrift.sasl.qop',
-    'hive.server2.transport.mode',
-    'hive.server2.use.SSL',
-    'hive.tez.container.size',
-    'hive.tez.java.opts',
-    'hive.tez.log.level',
-    'hive.txn.manager',
-    'hive.txn.timeout',
-    'hive.txn.max.open.batch',
-    'hive.compactor.initiator.on',
-    'hive.compactor.worker.threads',
-    'hive.compactor.worker.timeout',
-    'hive.compactor.check.interval',
-    'hive.compactor.delta.num.threshold',
-    'hive.compactor.delta.pct.threshold'
-  ]
-};
-
-var hiveProps = [];
-
-for (var category in hivePropsByCategory) {
-  hiveProps = hiveProps.concat(App.config.generateConfigPropertiesByName(hivePropsByCategory[category], 
-    { category: category, serviceName: 'HIVE', filename: 'hive-site.xml'}));
-}
-
-module.exports = hiveProps;
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/data/HDP2.2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.2/site_properties.js b/ambari-web/app/data/HDP2.2/site_properties.js
deleted file mode 100644
index 03e0615..0000000
--- a/ambari-web/app/data/HDP2.2/site_properties.js
+++ /dev/null
@@ -1,275 +0,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.
- */
-
-var App = require('app');
-
-var hdp22SepcificProperties = [
-  require('data/HDP2.2/yarn_properties'),
-  require('data/HDP2.2/tez_properties'),
-  require('data/HDP2.2/hive_properties')
-].reduce(function(p, c) { return c.concat(p); });
-
-var hdp2properties = require('data/HDP2/site_properties').configProperties;
-var excludedConfigs = [
-  'storm.thrift.transport', //In HDP2.2 storm.thrift.transport property is computed on server
-  'tez.am.container.session.delay-allocation-millis',
-  'tez.am.grouping.max-size',
-  'tez.am.grouping.min-size',
-  'tez.am.grouping.split-waves',
-  'tez.am.java.opts',
-  'tez.runtime.intermediate-input.compress.codec',
-  'tez.runtime.intermediate-input.is-compressed',
-  'tez.runtime.intermediate-output.compress.codec',
-  'tez.runtime.intermediate-output.should-compress',
-  'hive.heapsize'
-];
-var hdp22properties = hdp2properties.filter(function (item) {
-  return !excludedConfigs.contains(item.name);
-});
-
-hdp22properties.push(
-  {
-    "name": "yarn.timeline-service.leveldb-state-store.path",
-    "category": "APP_TIMELINE_SERVER",
-    "serviceName": "YARN",
-    "filename": "yarn-site.xml"
-  },
-  {
-    "name": "yarn.timeline-service.state-store-class",
-    "category": "APP_TIMELINE_SERVER",
-    "serviceName": "YARN",
-    "filename": "yarn-site.xml"
-  },
-  {
-    "name": "*.falcon.graph.blueprints.graph",
-    "category": "FalconStartupSite",
-    "serviceName": "FALCON",
-    "filename": "falcon-startup.properties.xml"
-  },
-  {
-    "name": "*.falcon.graph.storage.backend",
-    "category": "FalconStartupSite",
-    "serviceName": "FALCON",
-    "filename": "falcon-startup.properties.xml"
-  },
-  /*********RANGER FOR HDFS************/
-  {
-    "name": "XAAUDIT.HDFS.IS_ENABLED",
-    "dependentConfigPattern": "^XAAUDIT.HDFS",
-    "filename": "ranger-hdfs-plugin-properties.xml",
-    "serviceName": "HDFS"
-  },
-  {
-    "name": "ranger-hdfs-plugin-enabled",
-    "filename": "ranger-hdfs-plugin-properties.xml",
-    "serviceName": "HDFS",
-    "index": 1
-  },
-  /*********RANGER FOR HIVE************/
-  {
-    "name": "XAAUDIT.HDFS.IS_ENABLED",
-    "dependentConfigPattern": "^XAAUDIT.HDFS",
-    "filename": "ranger-hive-plugin-properties.xml",
-    "serviceName": "HIVE"
-  },
-  /*********RANGER FOR HBASE************/
-  {
-    "name": "XAAUDIT.HDFS.IS_ENABLED",
-    "dependentConfigPattern": "^XAAUDIT.HDFS",
-    "filename": "ranger-hbase-plugin-properties.xml",
-    "serviceName": "HBASE"
-  },
-  {
-    "name": "ranger-hbase-plugin-enabled",
-    "filename": "ranger-hbase-plugin-properties.xml",
-    "serviceName": "HBASE",
-    "index": 1
-  },
-  /*********RANGER FOR STORM************/
-  {
-    "name": "XAAUDIT.HDFS.IS_ENABLED",
-    "dependentConfigPattern": "^XAAUDIT.HDFS",
-    "filename": "ranger-storm-plugin-properties.xml",
-    "serviceName": "STORM"
-  },
-  {
-    "name": "ranger-storm-plugin-enabled",
-    "filename": "ranger-storm-plugin-properties.xml",
-    "serviceName": "STORM",
-    "index": 1
-  },
-  /*********RANGER FOR KNOX************/
-  {
-    "name": "XAAUDIT.HDFS.IS_ENABLED",
-    "dependentConfigPattern": "^XAAUDIT.HDFS",
-    "filename": "ranger-knox-plugin-properties.xml",
-    "serviceName": "KNOX"
-  },
-  {
-    "name": "ranger-knox-plugin-enabled",
-    "filename": "ranger-knox-plugin-properties.xml",
-    "serviceName": "KNOX",
-    "index": 1
-  },
-  /**********************************************RANGER***************************************/
-  {
-    "name": "ranger_admin_username",
-    "serviceName": "RANGER",
-    "filename": "ranger-env.xml",
-    "category": "RANGER_ADMIN",
-    "index": 0
-  },
-  {
-    "name": "ranger_admin_username",
-    "serviceName": "RANGER",
-    "filename": "ranger-env.xml",
-    "category": "RANGER_ADMIN",
-    "index": 0
-  },
-  {
-    "name": "ranger_admin_password",
-    "serviceName": "RANGER",
-    "filename": "ranger-env.xml",
-    "category": "RANGER_ADMIN",
-    "index": 1
-  },
-  {
-    "name": "SQL_CONNECTOR_JAR",
-    "serviceName": "RANGER",
-    "filename": "admin-properties.xml",
-    "category": "RANGER_ADMIN",
-    "index": 2
-  },
-  {
-    "name": "SQL_COMMAND_INVOKER",
-    "serviceName": "RANGER",
-    "filename": "admin-properties.xml",
-    "category": "DBSettings"
-  },
-  {
-    "name": "policymgr_external_url",
-    "serviceName": "RANGER",
-    "filename": "admin-properties.xml",
-    "category": "RangerSettings"
-  },
-  {
-    "name": "policymgr_http_enabled",
-    "serviceName": "RANGER",
-    "filename": "admin-properties.xml",
-    "category": "RangerSettings"
-  },
-  {
-    "name": "ranger_user",
-    "serviceName": "RANGER",
-    "filename": "ranger-env.xml",
-    "category": "RangerSettings"
-  },
-  {
-    "name": "ranger_group",
-    "serviceName": "RANGER",
-    "filename": "ranger-env.xml",
-    "category": "RangerSettings"
-  },
-  {
-    "name": "authentication_method",
-    "options": [
-      {
-        displayName: 'LDAP',
-        foreignKeys: ['xa_ldap_userDNpattern', 'xa_ldap_groupRoleAttribute', 'xa_ldap_url', 'xa_ldap_groupSearchBase', 'xa_ldap_groupSearchFilter']
-      },
-      {
-        displayName: 'ACTIVE_DIRECTORY',
-        foreignKeys: ['xa_ldap_ad_domain', 'xa_ldap_ad_url']
-      },
-      {
-        displayName: 'UNIX',
-        foreignKeys: ['remoteLoginEnabled', 'authServiceHostName', 'authServicePort']
-      },
-      {
-        displayName: 'NONE'
-      }
-    ],
-    "displayType": "radio button",
-    "radioName": "authentication-method",
-    "serviceName": "RANGER",
-    "filename": "admin-properties.xml",
-    "category": "RangerSettings"
-  },
-  {
-    "name": "remoteLoginEnabled",
-    "serviceName": "RANGER",
-    "filename": "admin-properties.xml",
-    "category": "UnixAuthenticationSettings"
-  },
-  {
-    "name": "authServiceHostName",
-    "serviceName": "RANGER",
-    "filename": "admin-properties.xml",
-    "category": "UnixAuthenticationSettings"
-  },
-  {
-    "name": "authServicePort",
-    "serviceName": "RANGER",
-    "filename": "admin-properties.xml",
-    "category": "UnixAuthenticationSettings"
-  },
-  {
-    "name": "xa_ldap_url",
-    "serviceName": "RANGER",
-    "filename": "admin-properties.xml",
-    "category": "LDAPSettings"
-  },
-  {
-    "name": "xa_ldap_userDNpattern",
-    "serviceName": "RANGER",
-    "filename": "admin-properties.xml",
-    "category": "LDAPSettings"
-  },
-  {
-    "name": "xa_ldap_groupRoleAttribute",
-    "serviceName": "RANGER",
-    "filename": "admin-properties.xml",
-    "category": "LDAPSettings"
-  },
-  {
-    "name": "xa_ldap_ad_domain",
-    "serviceName": "RANGER",
-    "filename": "admin-properties.xml",
-    "category": "ADSettings"
-  },
-  {
-    "name": "xa_ldap_ad_url",
-    "serviceName": "RANGER",
-    "filename": "admin-properties.xml",
-    "category": "ADSettings"
-  }
-);
-
-var additionalProperties = [];
-
-hdp22SepcificProperties.forEach(function (config) {
-  if (!hdp22properties.findProperty('name', config.name)) additionalProperties.push(config);
-  else {
-    hdp22properties.findProperty('name', config.name).category = config.category;
-  }
-});
-
-module.exports =
-{
-  "configProperties": hdp22properties.concat(additionalProperties)
-};

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/data/HDP2.2/tez_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.2/tez_properties.js b/ambari-web/app/data/HDP2.2/tez_properties.js
deleted file mode 100644
index 46f18ba..0000000
--- a/ambari-web/app/data/HDP2.2/tez_properties.js
+++ /dev/null
@@ -1,43 +0,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.
- */
-var App = require('app');
-
-var tezPropsToCategory = {
-  'General': [
-    'tez.am.launch.cmd-opts',
-    'tez.am.launch.env',
-    'tez.task.resource.memory.mb',
-    'tez.task.launch.cmd-opts',
-    'tez.task.launch.env',
-    'tez.grouping.split-waves',
-    'tez.grouping.min-size',
-    'tez.grouping.max-size',
-    'tez.runtime.compress',
-    'tez.runtime.compress.codec'
-  ]
-};
-
-var tezProps = [];
-
-for (var category in tezPropsToCategory) {
-  tezProps = tezProps.concat(App.config.generateConfigPropertiesByName(tezPropsToCategory[category], 
-    { category: category, serviceName: 'TEZ', filename: 'tez-site.xml'}));
-}
-
-module.exports = tezProps;
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/data/HDP2.2/yarn_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.2/yarn_properties.js b/ambari-web/app/data/HDP2.2/yarn_properties.js
deleted file mode 100644
index 6233401..0000000
--- a/ambari-web/app/data/HDP2.2/yarn_properties.js
+++ /dev/null
@@ -1,54 +0,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.
- */
-var App = require('app');
-
-var yarnPropsToCategory = {
-
-  'FaultTolerance': [
-    'yarn.nodemanager.recovery.enabled',
-    'yarn.resourcemanager.recovery.enabled',
-    'yarn.resourcemanager.work-preserving-recovery.enabled',
-    'yarn.resourcemanager.zk-address',
-    'yarn.resourcemanager.connect.retry-interval.ms',
-    'yarn.resourcemanager.connect.max-wait.ms',
-    'yarn.resourcemanager.ha.enabled'
-  ],
-
-  'Isolation': [
-    'yarn.nodemanager.linux-container-executor.group',
-    'yarn.nodemanager.container-executor.class',
-    'yarn.nodemanager.linux-container-executor.resources-handler.class',
-    'yarn.nodemanager.linux-container-executor.cgroups.hierarchy',
-    'yarn.nodemanager.linux-container-executor.cgroups.mount',
-    'yarn.nodemanager.linux-container-executor.cgroups.strict-resource-usage'
-  ],
-
-  'CapacityScheduler': [
-    'yarn.nodemanager.resource.cpu-vcores',
-    'yarn.nodemanager.resource.percentage-physical-cpu-limit'
-  ]
-};
-
-var yarnProps = [];
-
-for (var category in yarnPropsToCategory) {
-  yarnProps = yarnProps.concat(App.config.generateConfigPropertiesByName(yarnPropsToCategory[category],
-    { category: category, serviceName: 'YARN', filename: 'yarn-site.xml'}));
-}
-
-module.exports = yarnProps;

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/data/HDP2.3/hawq_activate_standby_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.3/hawq_activate_standby_properties.js b/ambari-web/app/data/HDP2.3/hawq_activate_standby_properties.js
deleted file mode 100644
index a06009f..0000000
--- a/ambari-web/app/data/HDP2.3/hawq_activate_standby_properties.js
+++ /dev/null
@@ -1,43 +0,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.
- */
-
-module.exports =
-{
-  "haConfig": {
-    serviceName: 'MISC',
-    displayName: 'MISC',
-    configCategories: [
-      App.ServiceConfigCategory.create({name: 'HAWQ', displayName: 'HAWQ'}),
-    ],
-    sites: ['hawq-site'],
-    configs: [
-    /**********************************************HAWQ***************************************/
-      {
-        "name": "hawq_master_address_host",
-        "displayName": "HAWQ Master Host",
-        "isReconfigurable": false,
-        "recommendedValue": "",
-        "isOverridable": false,
-        "value": "",
-        "category": "HAWQ",
-        "filename": "hawq-site",
-        serviceName: 'MISC'
-      }
-    ]
-  }
-};

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/data/HDP2.3/hawq_ha_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.3/hawq_ha_properties.js b/ambari-web/app/data/HDP2.3/hawq_ha_properties.js
deleted file mode 100644
index 62deba3..0000000
--- a/ambari-web/app/data/HDP2.3/hawq_ha_properties.js
+++ /dev/null
@@ -1,43 +0,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.
- */
-
-module.exports =
-{
-  "haConfig": {
-    serviceName: 'MISC',
-    displayName: 'MISC',
-    configCategories: [
-      App.ServiceConfigCategory.create({name: 'HAWQ', displayName: 'HAWQ'}),
-    ],
-    sites: ['hawq-site'],
-    configs: [
-    /**********************************************HAWQ***************************************/
-      {
-        "name": "hawq_standby_address_host",
-        "displayName": "HAWQ Standby Master",
-        "isReconfigurable": false,
-        "recommendedValue": "",
-        "isOverridable": false,
-        "value": "",
-        "category": "HAWQ",
-        "filename": "hawq-site",
-        serviceName: 'MISC'
-      },
-    ]
-  }
-};

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/data/HDP2.3/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.3/site_properties.js b/ambari-web/app/data/HDP2.3/site_properties.js
deleted file mode 100644
index 2dadd1b..0000000
--- a/ambari-web/app/data/HDP2.3/site_properties.js
+++ /dev/null
@@ -1,373 +0,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.
- */
-
-var App = require('app');
-
-var hdp22properties = require('data/HDP2.2/site_properties').configProperties;
-
-var excludedConfigs = [
-  'nimbus.host',
-  'XAAUDIT.DB.IS_ENABLED',
-  'XAAUDIT.HDFS.IS_ENABLED',
-  'UPDATE_XAPOLICIES_ON_GRANT_REVOKE',
-  'authServiceHostName',
-  'authServicePort',
-  'authentication_method',
-  'remoteLoginEnabled',
-  'xa_ldap_url',
-  'xa_ldap_userDNpattern',
-  'xa_ldap_groupSearchBase',
-  'xa_ldap_groupSearchFilter',
-  'xa_ldap_groupRoleAttribute',
-  'ranger.ldap.base.dn',
-  'ranger.ldap.bind.dn',
-  'ranger.ldap.bind.password',
-  'ranger.ldap.referral',
-  'xa_ldap_userSearchFilter',
-  'xa_ldap_ad_domain',
-  'xa_ldap_ad_url',
-  'ranger.ldap.ad.base.dn',
-  'ranger.ldap.ad.bind.dn',
-  'ranger.ldap.ad.bind.password',
-  'ranger.ldap.ad.referral',
-  'xa_ldap_ad_userSearchFilter',
-  'policymgr_http_enabled',
-  'policymgr_external_url',
-  'hbase.regionserver.global.memstore.lowerLimit',
-  'hbase.regionserver.global.memstore.upperLimit',
-  "port",
-  "hive.metastore.heapsize",
-  "hive.client.heapsize",
-  "SQL_COMMAND_INVOKER",
-  "SYNC_LDAP_USER_SEARCH_FILTER"
-];
-
-var hdp23properties = hdp22properties.filter(function (item) {
-  return !excludedConfigs.contains(item.name);
-});
-
-hdp23properties.push({
-  /**************************************** RANGER - HDFS Plugin ***************************************/
-
-    "name": "ranger-yarn-plugin-enabled",
-    "filename": "ranger-yarn-plugin-properties.xml",
-    "serviceName": "YARN",
-    "index": 1
-  },
-  {
-    "name": "ranger-kafka-plugin-enabled",
-    "filename": "ranger-kafka-plugin-properties.xml",
-    "serviceName": "KAFKA",
-    "index": 1
-  },
-  {
-    "name": "nimbus.seeds",
-    "serviceName": "STORM",
-    "filename": "storm-site.xml",
-    "category": "NIMBUS"
-  },
-  {
-    "name": "ranger.externalurl",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "RangerSettings"
-  },
-  {
-    "name": "ranger.service.http.enabled",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "RangerSettings"
-  },
-  {
-    "name": "ranger.authentication.method",
-    "options": [
-      {
-        displayName: 'LDAP',
-        foreignKeys: ['ranger.ldap.group.roleattribute', 'ranger.ldap.url', 'ranger.ldap.user.dnpattern','ranger.ldap.base.dn','ranger.ldap.bind.dn','ranger.ldap.bind.password','ranger.ldap.referral','ranger.ldap.user.searchfilter']
-      },
-      {
-        displayName: 'ACTIVE_DIRECTORY',
-        foreignKeys: ['ranger.ldap.ad.domain','ranger.ldap.ad.url','ranger.ldap.ad.base.dn','ranger.ldap.ad.bind.dn','ranger.ldap.ad.bind.password','ranger.ldap.ad.referral','ranger.ldap.ad.user.searchfilter']
-      },
-      {
-         displayName: 'PAM'
-      },
-      {
-        displayName: 'UNIX',
-        foreignKeys: ['ranger.unixauth.service.port', 'ranger.unixauth.service.hostname', 'ranger.unixauth.remote.login.enabled']
-      },
-      {
-        displayName: 'NONE'
-      }
-    ],
-    "displayType": "radio button",
-    "radioName": "authentication-method",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "RangerSettings"
-  },
-  {
-    "name": "policymgr_external_url",
-    "serviceName": "RANGER",
-    "filename": "admin-properties.xml",
-    "category": "RangerSettings"
-  },
-  {
-    "name": "ranger.unixauth.remote.login.enabled",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "UnixAuthenticationSettings"
-  },
-  {
-    "name": "ranger.unixauth.service.hostname",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "UnixAuthenticationSettings"
-  },
-  {
-    "name": "ranger.unixauth.service.port",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "UnixAuthenticationSettings"
-  },
-  {
-    "name": "ranger.ldap.url",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "LDAPSettings"
-  },
-  {
-    "name": "ranger.ldap.user.dnpattern",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "LDAPSettings"
-  },
-  {
-    "name": "ranger.ldap.group.roleattribute",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "LDAPSettings"
-  },
-  {
-    "name": "ranger.ldap.base.dn",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "LDAPSettings"
-  },
-  {
-    "name": "ranger.ldap.bind.dn",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "LDAPSettings"
-  },
-  {
-    "name": "ranger.ldap.bind.password",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "LDAPSettings"
-  },
-  {
-    "name": "ranger.ldap.referral",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "LDAPSettings"
-  },
-  {
-    "name": "ranger.ldap.user.searchfilter",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "LDAPSettings"
-  },
-  {
-    "name": "ranger.sso.providerurl",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "KnoxSSOSettings",
-    "index": 2
-  },
-  {
-    "name": "ranger.sso.publicKey",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "KnoxSSOSettings",
-    "index": 3
-  },
-  {
-    "name": "ranger.sso.cookiename",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "KnoxSSOSettings"
-  },
-  {
-    "name": "ranger.sso.enabled",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "KnoxSSOSettings",
-    "index": 1
-  },
-  {
-    "name": "ranger.sso.query.param.originalurl",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "KnoxSSOSettings"
-  },
-  {
-    "name": "ranger.sso.browser.useragent",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "KnoxSSOSettings"
-  },
-  {
-    "name": "ranger.ldap.ad.domain",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "ADSettings"
-  },
-  {
-    "name": "ranger.ldap.ad.url",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "ADSettings"
-  },
-  {
-    "name": "ranger.ldap.ad.base.dn",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "ADSettings"
-  },
-  {
-    "name": "ranger.ldap.ad.bind.dn",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "ADSettings"
-  },
-  {
-    "name": "ranger.ldap.ad.bind.password",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "ADSettings"
-  },
-  {
-    "name": "ranger.ldap.ad.referral",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "ADSettings"
-  },
-  {
-    "name": "ranger.ldap.ad.user.searchfilter",
-    "serviceName": "RANGER",
-    "filename": "ranger-admin-site.xml",
-    "category": "ADSettings"
-  },
-  /*********************************************** HAWQ **********************************************/
-  {
-    "name": "hawq_master_address_host",
-    "filename": "hawq-site.xml",
-    "category": "General",
-    "serviceName": "HAWQ",
-    "index": 0
-  },
-  {
-    "name": "hawq_standby_address_host",
-    "filename": "hawq-site.xml",
-    "category": "General",
-    "serviceName": "HAWQ",
-    "index": 1
-  },
-  {
-    "name": "hawq_master_address_port",
-    "filename": "hawq-site.xml",
-    "category": "General",
-    "serviceName": "HAWQ",
-    "index": 2
-  },
-  {
-    "name": "hawq_segment_address_port",
-    "filename": "hawq-site.xml",
-    "category": "General",
-    "serviceName": "HAWQ",
-    "index": 3
-  },
-  {
-    "name": "hawq_dfs_url",
-    "filename": "hawq-site.xml",
-    "category": "General",
-    "serviceName": "HAWQ",
-    "index": 4
-  },
-  {
-    "name": "hawq_master_directory",
-    "filename": "hawq-site.xml",
-    "category": "General",
-    "serviceName": "HAWQ",
-    "index": 5
-  },
-  {
-    "name": "hawq_master_temp_directory",
-    "filename": "hawq-site.xml",
-    "category": "General",
-    "serviceName": "HAWQ",
-    "index": 6
-  },
-  {
-    "name": "hawq_segment_directory",
-    "filename": "hawq-site.xml",
-    "category": "General",
-    "serviceName": "HAWQ",
-    "index": 7
-  },
-  {
-    "name": "hawq_segment_temp_directory",
-    "filename": "hawq-site.xml",
-    "category": "General",
-    "serviceName": "HAWQ",
-    "index": 8
-  },
-  {
-    "name": "default_segment_num",
-    "filename": "hawq-site.xml",
-    "category": "General",
-    "serviceName": "HAWQ",
-    "index": 9
-  },
-  {
-    "name": "hawq_ssh_exkeys",
-    "filename": "hawq-env.xml",
-    "category": "General",
-    "serviceName": "HAWQ",
-    "index": 10
-  },
-  {
-    "name": "hawq_password",
-    "filename": "hawq-env.xml",
-    "category": "General",
-    "serviceName": "HAWQ",
-    "index": 11
-  },
-  {
-    "name": "content",
-    "serviceName": "HAWQ",
-    "filename": "hawq-check-env.xml",
-    "category": "AdvancedHawqCheck"
-  }
-);
-
-module.exports =
-{
-  "configProperties": hdp23properties
-};

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/data/HDP2/alert_notification.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/alert_notification.js b/ambari-web/app/data/HDP2/alert_notification.js
deleted file mode 100644
index aba7436..0000000
--- a/ambari-web/app/data/HDP2/alert_notification.js
+++ /dev/null
@@ -1,145 +0,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.
- */
-
-/**
- * Alert Notification Properties
- */
-module.exports = [
-  {
-    "name": "create_notification",
-    "displayName": "Create Notification",
-    "isOverridable": false,
-    "isVisible": false,
-    "serviceName": "MISC",
-    "category": "Notifications",
-    "recommendedValue": "no",
-    "filename": "alert_notification"
-  },
-  {
-    "name": "mail.smtp.host",
-    "displayName": "SMTP Host",
-    "displayType": "host",
-    "isRequired": false,
-    "isReconfigurable": true,
-    "isOverridable": false,
-    "isVisible": true,
-    "serviceName": "MISC",
-    "category": "Notifications",
-    "rowStyleClass": "indent-1",
-    "filename": "alert_notification"
-  },
-  {
-    "name": "mail.smtp.port",
-    "displayName": "SMTP Port",
-    "displayType": "int",
-    "isRequired": false,
-    "isReconfigurable": true,
-    "isOverridable": false,
-    "isVisible": true,
-    "serviceName": "MISC",
-    "category": "Notifications",
-    "rowStyleClass": "indent-1",
-    "filename": "alert_notification"
-  },
-  {
-    "name": "mail.smtp.from",
-    "displayName": "FROM Email Address",
-    "displayType": "email",
-    "isRequired": false,
-    "isReconfigurable": true,
-    "isOverridable": false,
-    "isVisible": true,
-    "serviceName": "MISC",
-    "category": "Notifications",
-    "rowStyleClass": "indent-1",
-    "filename": "alert_notification"
-  },
-  {
-    "name": "ambari.dispatch.recipients",
-    "displayName": " TO Email Address",
-    "displayType": "email",
-    "isRequired": false,
-    "isReconfigurable": true,
-    "isOverridable": false,
-    "isVisible": true,
-    "serviceName": "MISC",
-    "category": "Notifications",
-    "rowStyleClass": "indent-1",
-    "filename": "alert_notification"
-  },
-  {
-    "name": "smtp_use_auth",
-    "displayName": "SMTP server requires authentication",
-    "displayType": "checkbox",
-    "isRequired": false,
-    "isReconfigurable": true,
-    "isOverridable": false,
-    "recommendedValue": true,
-    "isVisible": true,
-    "serviceName": "MISC",
-    "category": "Notifications",
-    "rowStyleClass": "indent-1",
-    "filename": "alert_notification"
-  },
-  {
-    "name": "ambari.dispatch.credential.username",
-    "displayName": "SMTP Username",
-    "isRequired": false,
-    "isReconfigurable": true,
-    "isOverridable": false,
-    "isVisible": true,
-    "serviceName": "MISC",
-    "category": "Notifications",
-    "rowStyleClass": "indent-2",
-    "filename": "alert_notification"
-  },
-  {
-    "name": "ambari.dispatch.credential.password",
-    "displayName": "SMTP Password",
-    "isRequired": false,
-    "isReconfigurable": true,
-    "isOverridable": false,
-    "isVisible": true,
-    "serviceName": "MISC",
-    "category": "Notifications",
-    "rowStyleClass": "indent-2",
-    "filename": "alert_notification"
-  },
-  {
-    "name": "mail.smtp.starttls.enable",
-    "isRequired": false,
-    "isReconfigurable": true,
-    "isOverridable": false,
-    "isVisible": false,
-    "serviceName": "MISC",
-    "category": "Notifications",
-    "rowStyleClass": "indent-1",
-    "filename": "alert_notification"
-  },
-  {
-    "name": "mail.smtp.startssl.enable",
-    "isRequired": false,
-    "isReconfigurable": true,
-    "isOverridable": false,
-    "isVisible": false,
-    "serviceName": "MISC",
-    "category": "Notifications",
-    "rowStyleClass": "indent-1",
-    "filename": "alert_notification"
-  }
-];

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/data/HDP2/gluster_fs_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/gluster_fs_properties.js b/ambari-web/app/data/HDP2/gluster_fs_properties.js
deleted file mode 100644
index 5cec5f1..0000000
--- a/ambari-web/app/data/HDP2/gluster_fs_properties.js
+++ /dev/null
@@ -1,94 +0,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.
- */
-
-module.exports = [
-/**********************************************GLUSTERFS***************************************/
-  {
-    "name": "fs.glusterfs.impl",
-    "filename": "core-site.xml",
-    "serviceName": "GLUSTERFS",
-    "category": "General"
-  },
-  {
-    "name": "fs.AbstractFileSystem.glusterfs.impl",
-    "filename": "core-site.xml",
-    "serviceName": "GLUSTERFS",
-    "category": "General"
-  },
-  {
-    "name": "hadoop_heapsize",
-    "serviceName": "GLUSTERFS",
-    "filename": "hadoop-env.xml",
-    "category": "General Hadoop",
-    "index": 1
-  },
-  {
-    "name": "hdfs_log_dir_prefix",
-    "serviceName": "GLUSTERFS",
-    "filename": "hadoop-env.xml",
-    "category": "General Hadoop"
-  },
-  {
-    "name": "hadoop_pid_dir_prefix",
-    "serviceName": "GLUSTERFS",
-    "filename": "hadoop-env.xml",
-    "category": "General Hadoop"
-  },
-  {
-    "name": "namenode_heapsize",
-    "serviceName": "GLUSTERFS",
-    "filename": "hadoop-env.xml",
-    "category": "General Hadoop"
-  },
-  {
-    "name": "namenode_opt_newsize",
-    "serviceName": "GLUSTERFS",
-    "filename": "hadoop-env.xml",
-    "category": "General Hadoop"
-  },
-  {
-    "name": "namenode_opt_maxnewsize",
-    "serviceName": "GLUSTERFS",
-    "filename": "hadoop-env.xml",
-    "category": "General Hadoop"
-  },
-  {
-    "name": "namenode_opt_permsize",
-    "serviceName": "GLUSTERFS",
-    "filename": "hadoop-env.xml",
-    "category": "General Hadoop"
-  },
-  {
-    "name": "namenode_opt_maxpermsize",
-    "serviceName": "GLUSTERFS",
-    "filename": "hadoop-env.xml",
-    "category": "General Hadoop"
-  },
-  {
-    "name": "dtnode_heapsize",
-    "serviceName": "GLUSTERFS",
-    "filename": "hadoop-env.xml",
-    "category": "General Hadoop"
-  },
-  {
-    "name": "glusterfs_user",
-    "serviceName": "GLUSTERFS",
-    "filename": "hadoop-env.xml",
-    "category": "General Hadoop"
-  }
-];
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/data/HDP2/ha_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/ha_properties.js b/ambari-web/app/data/HDP2/ha_properties.js
deleted file mode 100644
index 0275371..0000000
--- a/ambari-web/app/data/HDP2/ha_properties.js
+++ /dev/null
@@ -1,538 +0,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.
- */
-
-module.exports =
-{
-  "haConfig": {
-    serviceName: 'MISC',
-    displayName: 'MISC',
-    configCategories: [
-      App.ServiceConfigCategory.create({ name: 'HDFS', displayName: 'HDFS'}),
-      App.ServiceConfigCategory.create({ name: 'HBASE', displayName: 'HBase'}),
-      App.ServiceConfigCategory.create({ name: 'ACCUMULO', displayName: 'Accumulo'}),
-      App.ServiceConfigCategory.create({ name: 'AMBARI_METRICS', displayName: 'Ambari Metrics'}),
-      App.ServiceConfigCategory.create({ name: 'HAWQ', displayName: 'HAWQ'}), 
-      App.ServiceConfigCategory.create({ name: 'RANGER', displayName: 'Ranger'})
-    ],
-    sites: ['core-site', 'hdfs-site', 'hbase-site', 'accumulo-site', 'ams-hbase-site', 'hawq-site', 'hdfs-client', 'ranger-env', 'ranger-knox-plugin-properties', 'ranger-kms-audit', 'ranger-storm-plugin-properties', 'ranger-hbase-plugin-properties', 'ranger-hdfs-plugin-properties', 'ranger-hive-plugin-properties', 'ranger-kafka-audit', 'ranger-knox-audit', 'ranger-hdfs-audit', 'ranger-hive-audit', 'ranger-atlas-audit', 'ranger-storm-audit', 'ranger-hbase-audit', 'ranger-yarn-audit'],
-    configs: [
-    /**********************************************HDFS***************************************/
-      {
-        "name": "dfs.journalnode.edits.dir",
-        "displayName": "dfs.journalnode.edits.dir",
-        "description": "The Directory where the JournalNode will store its local state.",
-        "isReconfigurable": true,
-        "recommendedValue": "/hadoop/hdfs/journal",
-        "value": "/hadoop/hdfs/journal",
-        "displayType": "directory",
-        "category": "HDFS",
-        "filename": "hdfs-site",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "fs.defaultFS",
-        "displayName": "fs.defaultFS",
-        "description": "The default path prefix used by the Hadoop FS client when none is given.",
-        "recommendedValue": "hdfs://haCluster",
-        "isReconfigurable": false,
-        "value": "hdfs://haCluster",
-        "category": "HDFS",
-        "filename": "core-site",
-        serviceName: 'MISC'
-      },
-      {
-        "name": "ha.zookeeper.quorum",
-        "displayName": "ha.zookeeper.quorum",
-        "isReconfigurable": false,
-        "description": "This lists the host-port pairs running the ZooKeeper service.",
-        "recommendedValue": "zk1.example.com:2181,zk2.example.com:2181,zk3.example.com:2181",
-        "value": "zk1.example.com:2181,zk2.example.com:2181,zk3.example.com:2181",
-        "category": "HDFS",
-        "filename": "core-site",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "dfs.nameservices",
-        "displayName": "dfs.nameservices",
-        "description": "Comma-separated list of nameservices.",
-        "isReconfigurable": false,
-        "recommendedValue": "haCluster",
-        "value": "haCluster",
-        "category": "HDFS",
-        "filename": "hdfs-site",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "dfs.internal.nameservices",
-        "displayName": "dfs.internal.nameservices",
-        "description": "Comma-separated list of nameservices.",
-        "isReconfigurable": false,
-        "recommendedValue": "haCluster",
-        "value": "haCluster",
-        "category": "HDFS",
-        "filename": "hdfs-site",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "dfs.ha.namenodes.${dfs.nameservices}",
-        "displayName": "dfs.ha.namenodes.${dfs.nameservices}",
-        "description": "The prefix for a given nameservice, contains a comma-separated list of namenodes for a given nameservice.",
-        "isReconfigurable": false,
-        "recommendedValue": "nn1,nn2",
-        "value": "nn1,nn2",
-        "category": "HDFS",
-        "filename": "hdfs-site",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "dfs.namenode.rpc-address.${dfs.nameservices}.nn1",
-        "displayName": "dfs.namenode.rpc-address.${dfs.nameservices}.nn1",
-        "description": "RPC address that handles all clients requests for nn1.",
-        "isReconfigurable": false,
-        "recommendedValue": "0.0.0.0:8020",
-        "value": "0.0.0.0:8020",
-        "category": "HDFS",
-        "filename": "hdfs-site",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "dfs.namenode.rpc-address.${dfs.nameservices}.nn2",
-        "displayName": "dfs.namenode.rpc-address.${dfs.nameservices}.nn2",
-        "description": "RPC address that handles all clients requests for nn2.",
-        "isReconfigurable": false,
-        "recommendedValue": "0.0.0.0:8020",
-        "value": "0.0.0.0:8020",
-        "category": "HDFS",
-        "filename": "hdfs-site",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "dfs.namenode.http-address.${dfs.nameservices}.nn1",
-        "displayName": "dfs.namenode.http-address.${dfs.nameservices}.nn1",
-        "description": "The fully-qualified HTTP address for nn1 NameNode.",
-        "isReconfigurable": false,
-        "recommendedValue": "0.0.0.0:50070",
-        "value": "0.0.0.0:50070",
-        "category": "HDFS",
-        "filename": "hdfs-site",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "dfs.namenode.http-address.${dfs.nameservices}.nn2",
-        "displayName": "dfs.namenode.http-address.${dfs.nameservices}.nn2",
-        "description": "The fully-qualified HTTP address for nn2 NameNode.",
-        "isReconfigurable": false,
-        "recommendedValue": "0.0.0.0:50070",
-        "value": "0.0.0.0:50070",
-        "category": "HDFS",
-        "filename": "hdfs-site",
-        serviceName: 'MISC'
-      },
-      {
-        "name": "dfs.namenode.https-address.${dfs.nameservices}.nn1",
-        "displayName": "dfs.namenode.https-address.${dfs.nameservices}.nn1",
-        "description": "The fully-qualified HTTP address for nn1 NameNode.",
-        "isReconfigurable": false,
-        "recommendedValue": "0.0.0.0:50470",
-        "value": "0.0.0.0:50470",
-        "category": "HDFS",
-        "filename": "hdfs-site",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "dfs.namenode.https-address.${dfs.nameservices}.nn2",
-        "displayName": "dfs.namenode.https-address.${dfs.nameservices}.nn2",
-        "description": "The fully-qualified HTTP address for nn2 NameNode.",
-        "isReconfigurable": false,
-        "recommendedValue": "0.0.0.0:50470",
-        "value": "0.0.0.0:50470",
-        "category": "HDFS",
-        "filename": "hdfs-site",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "dfs.client.failover.proxy.provider.${dfs.nameservices}",
-        "displayName": "dfs.client.failover.proxy.provider.${dfs.nameservices}",
-        "description": "The Java class that HDFS clients use to contact the Active NameNode.",
-        "recommendedValue": "org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider",
-        "isReconfigurable": false,
-        "value": "org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider",
-        "category": "HDFS",
-        "filename": "hdfs-site",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "dfs.namenode.shared.edits.dir",
-        "displayName": "dfs.namenode.shared.edits.dir",
-        "description": " The URI which identifies the group of JNs where the NameNodes will write/read edits.",
-        "isReconfigurable": false,
-        "recommendedValue": "qjournal://node1.example.com:8485;node2.example.com:8485;node3.example.com:8485/mycluster",
-        "value": "qjournal://node1.example.com:8485;node2.example.com:8485;node3.example.com:8485/mycluster",
-        "category": "HDFS",
-        "filename": "hdfs-site",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "dfs.ha.fencing.methods",
-        "displayName": "dfs.ha.fencing.methods",
-        "description": "A list of scripts or Java classes which will be used to fence the Active NameNode during a failover.",
-        "isReconfigurable": false,
-        "recommendedValue": "shell(/bin/true)",
-        "displayType": "multiLine",
-        "value": "shell(/bin/true)",
-        "category": "HDFS",
-        "filename": "hdfs-site",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "dfs.ha.automatic-failover.enabled",
-        "displayName": "dfs.ha.automatic-failover.enabled",
-        "description": "Enable Automatic failover.",
-        "isReconfigurable": false,
-        "recommendedValue": true,
-        "value": true,
-        "displayType": "checkbox",
-        "category": "HDFS",
-        "filename": "hdfs-site",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "dfs.namenode.safemode.threshold-pct",
-        "displayName": "dfs.namenode.safemode.threshold-pct",
-        "description": "Specifies the percentage of blocks that should satisfy\n        the minimal replication requirement defined by dfs.namenode.replication.min.\n        Values less than or equal to 0 mean not to start in safe mode.\n        Values greater than 1 will make safe mode permanent.\n ",
-        "isReconfigurable": false,
-        "recommendedValue": "0.99f",
-        "value": "0.99f",
-        "category": "HDFS",
-        "filename": "hdfs-site",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "hbase.rootdir",
-        "displayName": "hbase.rootdir",
-        "description": "The directory shared by region servers and into which HBase persists.",
-        "isReconfigurable": false,
-        "recommendedValue": "/hadoop/hdfs/journal",
-        "value": "/hadoop/hdfs/journal",
-        "category": "HBASE",
-        "filename": "hbase-site",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "instance.volumes",
-        "displayName": "instance.volumes",
-        "isReconfigurable": false,
-        "recommendedValue": "/hadoop/hdfs/journal",
-        "value": "/hadoop/hdfs/journal",
-        "category": "ACCUMULO",
-        "filename": "accumulo-site",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "instance.volumes.replacements",
-        "displayName": "instance.volumes.replacements",
-        "isReconfigurable": false,
-        "recommendedValue": "/hadoop/hdfs/journal",
-        "value": "/hadoop/hdfs/journal",
-        "category": "ACCUMULO",
-        "filename": "accumulo-site",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "hbase.rootdir",
-        "displayName": "hbase.rootdir",
-        "description": "Ambari Metrics service uses HBase as default storage backend. Set the rootdir for HBase to either local filesystem path if using Ambari Metrics in embedded mode or to a HDFS dir, example: hdfs://namenode.example.org:8020/amshbase.",
-        "isReconfigurable": false,
-        "recommendedValue": "file:///var/lib/ambari-metrics-collector/hbase",
-        "value": "file:///var/lib/ambari-metrics-collector/hbase",
-        "category": "AMBARI_METRICS",
-        "isVisible": false,
-        "filename": "ams-hbase-site",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "xasecure.audit.destination.hdfs.dir",
-        "displayName": "Destination HDFS Directory",
-        "description": "HDFS folder to write audit to, make sure all service user has required permissions. This property is overridable at service level.",
-        "isReconfigurable": false,
-        "recommendedValue": "hdfs://haCluster",
-        "value": "hdfs://haCluster",
-        "category": "RANGER",
-        "filename": "ranger-env",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "xasecure.audit.destination.hdfs.dir",
-        "displayName": "Destination HDFS Directory",
-        "description": "HDFS folder to write audit to, make sure all service user has required permissions. This property is overridable at service level.",
-        "isReconfigurable": false,
-        "recommendedValue": "hdfs://haCluster",
-        "value": "hdfs://haCluster",
-        "category": "HDFS",
-        "filename": "ranger-hdfs-audit",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "xasecure.audit.destination.hdfs.dir",
-        "displayName": "Destination HDFS Directory",
-        "description": "HDFS folder to write audit to, make sure all service user has required permissions. This property is overridable at service level.",
-        "isReconfigurable": false,
-        "recommendedValue": "hdfs://haCluster",
-        "value": "hdfs://haCluster",
-        "category": "HDFS",
-        "isVisible": false,
-        "filename": "ranger-hdfs-plugin-properties",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "xasecure.audit.destination.hdfs.dir",
-        "displayName": "Destination HDFS Directory",
-        "description": "HDFS folder to write audit to, make sure all service user has required permissions. This property is overridable at service level.",
-        "isReconfigurable": false,
-        "recommendedValue": "hdfs://haCluster",
-        "value": "hdfs://haCluster",
-        "category": "KAFKA",
-        "isVisible": false,
-        "filename": "ranger-kafka-audit",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "xasecure.audit.destination.hdfs.dir",
-        "displayName": "Destination HDFS Directory",
-        "description": "HDFS folder to write audit to, make sure all service user has required permissions. This property is overridable at service level.",
-        "isReconfigurable": false,
-        "recommendedValue": "hdfs://haCluster",
-        "value": "hdfs://haCluster",
-        "category": "KNOX",
-        "isVisible": false,
-        "filename": "ranger-knox-plugin-properties",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "xasecure.audit.destination.hdfs.dir",
-        "displayName": "Destination HDFS Directory",
-        "description": "HDFS folder to write audit to, make sure all service user has required permissions. This property is overridable at service level.",
-        "isReconfigurable": false,
-        "recommendedValue": "hdfs://haCluster",
-        "value": "hdfs://haCluster",
-        "category": "RANGER_KMS",
-        "isVisible": false,
-        "filename": "ranger-kms-audit",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "xasecure.audit.destination.hdfs.dir",
-        "displayName": "Destination HDFS Directory",
-        "description": "HDFS folder to write audit to, make sure all service user has required permissions. This property is overridable at service level.",
-        "isReconfigurable": false,
-        "recommendedValue": "hdfs://haCluster",
-        "value": "hdfs://haCluster",
-        "category": "STORM",
-        "isVisible": false,
-        "filename": "ranger-storm-audit",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "xasecure.audit.destination.hdfs.dir",
-        "displayName": "Destination HDFS Directory",
-        "description": "HDFS folder to write audit to, make sure all service user has required permissions. This property is overridable at service level.",
-        "isReconfigurable": false,
-        "recommendedValue": "hdfs://haCluster",
-        "value": "hdfs://haCluster",
-        "category": "STORM",
-        "isVisible": false,
-        "filename": "ranger-storm-plugin-properties",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "xasecure.audit.destination.hdfs.dir",
-        "displayName": "Destination HDFS Directory",
-        "description": "HDFS folder to write audit to, make sure all service user has required permissions. This property is overridable at service level.",
-        "isReconfigurable": false,
-        "recommendedValue": "hdfs://haCluster",
-        "value": "hdfs://haCluster",
-        "category": "HBASE",
-        "isVisible": false,
-        "filename": "ranger-hbase-plugin-properties",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "xasecure.audit.destination.hdfs.dir",
-        "displayName": "Destination HDFS Directory",
-        "description": "HDFS folder to write audit to, make sure all service user has required permissions. This property is overridable at service level.",
-        "isReconfigurable": false,
-        "recommendedValue": "hdfs://haCluster",
-        "value": "hdfs://haCluster",
-        "category": "HIVE",
-        "isVisible": false,
-        "filename": "ranger-hive-plugin-properties",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "xasecure.audit.destination.hdfs.dir",
-        "displayName": "Destination HDFS Directory",
-        "description": "HDFS folder to write audit to, make sure all service user has required permissions. This property is overridable at service level.",
-        "isReconfigurable": false,
-        "recommendedValue": "hdfs://haCluster",
-        "value": "hdfs://haCluster",
-        "category": "HBASE",
-        "isVisible": false,
-        "filename": "ranger-hbase-audit",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "xasecure.audit.destination.hdfs.dir",
-        "displayName": "Destination HDFS Directory",
-        "description": "HDFS folder to write audit to, make sure all service user has required permissions. This property is overridable at service level.",
-        "isReconfigurable": false,
-        "recommendedValue": "hdfs://haCluster",
-        "value": "hdfs://haCluster",
-        "category": "KNOX",
-        "isVisible": false,
-        "filename": "ranger-knox-audit",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "xasecure.audit.destination.hdfs.dir",
-        "displayName": "Destination HDFS Directory",
-        "description": "HDFS folder to write audit to, make sure all service user has required permissions. This property is overridable at service level.",
-        "isReconfigurable": false,
-        "recommendedValue": "hdfs://haCluster",
-        "value": "hdfs://haCluster",
-        "category": "HIVE",
-        "isVisible": false,
-        "filename": "ranger-hive-audit",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "xasecure.audit.destination.hdfs.dir",
-        "displayName": "Destination HDFS Directory",
-        "description": "HDFS folder to write audit to, make sure all service user has required permissions. This property is overridable at service level.",
-        "isReconfigurable": false,
-        "recommendedValue": "hdfs://haCluster",
-        "value": "hdfs://haCluster",
-        "category": "YARN",
-        "isVisible": false,
-        "filename": "ranger-yarn-audit",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "xasecure.audit.destination.hdfs.dir",
-        "displayName": "Destination HDFS Directory",
-        "description": "HDFS folder to write audit to, make sure all service user has required permissions. This property is overridable at service level.",
-        "isReconfigurable": false,
-        "recommendedValue": "hdfs://haCluster",
-        "value": "hdfs://haCluster",
-        "category": "ATLAS",
-        "isVisible": false,
-        "filename": "ranger-atlas-audit",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "xasecure.audit.destination.hdfs.dir",
-        "displayName": "Destination HDFS Directory",
-        "description": "HDFS folder to write audit to, make sure all service user has required permissions. This property is overridable at service level.",
-        "isReconfigurable": false,
-        "recommendedValue": "hdfs://haCluster",
-        "value": "hdfs://haCluster",
-        "category": "RANGER_KMS",
-        "isVisible": false,
-        "filename": "ranger-kms-audit",
-        "serviceName": 'MISC'
-      },
-    /**********************************************HAWQ***************************************/
-      {
-        "name": "hawq_dfs_url",
-        "displayName": "hawq_dfs_url",
-        "description": "URL for Accessing HDFS",
-        "isReconfigurable": false,
-        "recommendedValue": "haCluster/hawq_data",
-        "value": "haCluster/hawq_data",
-        "category": "HAWQ",
-        "filename": "hawq-site",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "dfs.nameservices",
-        "displayName": "dfs.nameservices",
-        "description": "Comma-separated list of nameservices.",
-        "isReconfigurable": false,
-        "recommendedValue": "haCluster",
-        "value": "haCluster",
-        "category": "HAWQ",
-        "filename": "hdfs-client",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "dfs.ha.namenodes.${dfs.nameservices}",
-        "displayName": "dfs.ha.namenodes.${dfs.nameservices}",
-        "description": "The prefix for a given nameservice, contains a comma-separated list of namenodes for a given nameservice.",
-        "isReconfigurable": false,
-        "recommendedValue": "nn1,nn2",
-        "value": "nn1,nn2",
-        "category": "HAWQ",
-        "filename": "hdfs-client",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "dfs.namenode.rpc-address.${dfs.nameservices}.nn1",
-        "displayName": "dfs.namenode.rpc-address.${dfs.nameservices}.nn1",
-        "description": "RPC address that handles all clients requests for nn1.",
-        "isReconfigurable": false,
-        "recommendedValue": "0.0.0.0:8020",
-        "value": "0.0.0.0:8020",
-        "category": "HAWQ",
-        "filename": "hdfs-client",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "dfs.namenode.rpc-address.${dfs.nameservices}.nn2",
-        "displayName": "dfs.namenode.rpc-address.${dfs.nameservices}.nn2",
-        "description": "RPC address that handles all clients requests for nn2.",
-        "isReconfigurable": false,
-        "recommendedValue": "0.0.0.0:8020",
-        "value": "0.0.0.0:8020",
-        "category": "HAWQ",
-        "filename": "hdfs-client",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "dfs.namenode.http-address.${dfs.nameservices}.nn1",
-        "displayName": "dfs.namenode.http-address.${dfs.nameservices}.nn1",
-        "description": "The fully-qualified HTTP address for nn1 NameNode.",
-        "isReconfigurable": false,
-        "recommendedValue": "0.0.0.0:50070",
-        "value": "0.0.0.0:50070",
-        "category": "HAWQ",
-        "filename": "hdfs-client",
-        "serviceName": 'MISC'
-      },
-      {
-        "name": "dfs.namenode.http-address.${dfs.nameservices}.nn2",
-        "displayName": "dfs.namenode.http-address.${dfs.nameservices}.nn2",
-        "description": "The fully-qualified HTTP address for nn2 NameNode.",
-        "isReconfigurable": false,
-        "recommendedValue": "0.0.0.0:50070",
-        "value": "0.0.0.0:50070",
-        "category": "HAWQ",
-        "filename": "hdfs-client",
-        "serviceName": 'MISC'
-      }
-    ]
-  }
-};

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/data/HDP2/kerberos_descriptor_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/kerberos_descriptor_properties.js b/ambari-web/app/data/HDP2/kerberos_descriptor_properties.js
deleted file mode 100644
index f6e4239..0000000
--- a/ambari-web/app/data/HDP2/kerberos_descriptor_properties.js
+++ /dev/null
@@ -1,35 +0,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.
- */
-
-var properties = [
-  {
-    "name": "keytab_dir",
-    "index": 3
-  },
-  {
-    "name": "realm",
-    "index": 4
-  },
-  {
-    "name": "additional_realms",
-    "index": 5,
-    "placeholderText": "(" + Em.I18n.t("common.optional") + ")"
-  }
-];
-
-module.exports = properties;

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/data/HDP2/kerberos_identities.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/kerberos_identities.js b/ambari-web/app/data/HDP2/kerberos_identities.js
deleted file mode 100644
index 8af6702..0000000
--- a/ambari-web/app/data/HDP2/kerberos_identities.js
+++ /dev/null
@@ -1,129 +0,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.
- */
-
-var App = require('app');
-
-module.exports = {
-  configProperties: [
-    {
-      "name": "smokeuser_principal_name",
-      "displayName": "Smoke user principal",
-      "category": "Ambari Principals",
-      "filename": "cluster-env.xml",
-      "index": 1
-    },
-    {
-      "name": "smokeuser_keytab",
-      "displayName": "Smoke user keytab",
-      "category": "Ambari Principals",
-      "filename": "cluster-env.xml",
-      "index": 2
-    },
-    {
-      "name": "ambari-server_keytab",
-      "displayName": "Ambari Keytab",
-      "category": "Ambari Principals",
-      "filename": "cluster-env.xml",
-      "index": 3
-    },
-    {
-      "name": "hdfs_principal_name",
-      "displayName": "HDFS user principal",
-      "category": "Ambari Principals",
-      "filename": "hadoop-env.xml",
-      "index": 4
-    },
-    {
-      "name": "hdfs_user_keytab",
-      "displayName": "HDFS user keytab",
-      "category": "Ambari Principals",
-      "filename": "hadoop-env.xml",
-      "index": 5
-    },
-    {
-      "name": "hbase_principal_name",
-      "displayName": "HBase user principal",
-      "category": "Ambari Principals",
-      "filename": "hbase-env.xml",
-      "index": 6
-    },
-    {
-      "name": "hbase_user_keytab",
-      "displayName": "HBase user keytab",
-      "category": "Ambari Principals",
-      "filename": "hbase-env.xml",
-      "index": 7
-    },
-    {
-      "name": "accumulo_principal_name",
-      "displayName": "Accumulo user principal",
-      "category": "Ambari Principals",
-      "filename": "accumulo-env.xml",
-      "index": 8
-    },
-    {
-      "name": "accumulo_user_keytab",
-      "displayName": "Accumulo user keytab",
-      "category": "Ambari Principals",
-      "filename": "accumulo-env.xml",
-      "index": 9
-    },
-    {
-      "name": "spark.history.kerberos.principal",
-      "displayName": "Spark user principal",
-      "category": "Ambari Principals",
-      "filename": "spark-defaults.xml",
-      "index": 10
-    },
-    {
-      "name": "spark.history.kerberos.keytab",
-      "displayName": "Spark user keytab",
-      "category": "Ambari Principals",
-      "filename": "spark-defaults.xml",
-      "index": 11
-    },
-    {
-      "name": "spark.history.kerberos.principal",
-      "displayName": "Spark2 user principal",
-      "category": "Ambari Principals",
-      "filename": "spark2-defaults.xml",
-      "index": 12
-    },
-    {
-      "name": "spark.history.kerberos.keytab",
-      "displayName": "Spark2 user keytab",
-      "category": "Ambari Principals",
-      "filename": "spark2-defaults.xml",
-      "index": 13
-    },
-    {
-      "name": "storm_principal_name",
-      "displayName": "Storm user principal",
-      "category": "Ambari Principals",
-      "filename": "storm-env.xml",
-      "index": 14
-    },
-    {
-      "name": "storm_keytab",
-      "displayName": "Storm user keytab",
-      "category": "Ambari Principals",
-      "filename": "storm-env.xml",
-      "index": 15
-    }
-  ]
-};

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ce9e3b6/ambari-web/app/data/HDP2/move_journal_node_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/move_journal_node_properties.js b/ambari-web/app/data/HDP2/move_journal_node_properties.js
deleted file mode 100644
index 87a6cfd..0000000
--- a/ambari-web/app/data/HDP2/move_journal_node_properties.js
+++ /dev/null
@@ -1,42 +0,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.
- */
-
-module.exports =
-{
-  "moveJNConfig": {
-    serviceName: 'MISC',
-    displayName: 'MISC',
-    configCategories: [
-      App.ServiceConfigCategory.create({ name: 'HDFS', displayName: 'HDFS'})
-    ],
-    sites: ['hdfs-site'],
-    configs: [
-      {
-        "name": "dfs.namenode.shared.edits.dir",
-        "displayName": "dfs.namenode.shared.edits.dir",
-        "description": " The URI which identifies the group of JNs where the NameNodes will write/read edits.",
-        "isReconfigurable": false,
-        "recommendedValue": "qjournal://node1.example.com:8485;node2.example.com:8485;node3.example.com:8485/mycluster",
-        "value": "qjournal://node1.example.com:8485;node2.example.com:8485;node3.example.com:8485/mycluster",
-        "category": "HDFS",
-        "filename": "hdfs-site",
-        "serviceName": 'MISC'
-      }
-    ]
-  }
-};


Mime
View raw message