AMBARI-4381. Add Services does not work because of ATS UI changes. (Denys Buzhor via akovalenko)

ambari-web/app/data/HDP2/global_properties.js

@@ -329,34 +329,6 @@ module.exports =
       "category": "ResourceManager",
       "index": 0
     },
-    {
-      "id": "puppet var",
-      "name": "ats_host",
-      "displayName": "App Timeline Server",
-      "description": "Application Timeline Server Host",
-      "defaultValue": "",
-      "isOverridable": false,
-      "displayType": "masterHost",
-      "isRequiredByAgent": false,
-      "isVisible": App.supports.appTimelineServer, // @todo remove test mode check after App Timeline service integration
-      "serviceName": "YARN",
-      "category": "AppTimelineServer",
-      "index": 0
-    },
-    {
-      "id": "puppet var",
-      "name": "ats_server_port",
-      "displayName": "Server port",
-      "description": "Application Timeline Server port",
-      "defaultValue": "9292", // @todo add correct value APP_TIMELINE_SERVER.port
-      "isOverridable": false,
-      "displayType": "int",
-      "isRequiredByAgent": true,
-      "isVisible": App.supports.appTimelineServer, // @todo remove test mode check after App Timeline service integration
-      "serviceName": "YARN",
-      "category": "AppTimelineServer",
-      "index": 1
-    },
     {
       "id": "puppet var",
       "name": "resourcemanager_heapsize",
@@ -425,6 +397,35 @@ module.exports =
       "serviceName": "YARN",
       "category": "Advanced"
     },
+// @todo uncomment after App Timeline service integration
+//    {
+//      "id": "puppet var",
+//      "name": "ats_host",
+//      "displayName": "App Timeline Server",
+//      "description": "Application Timeline Server Host",
+//      "defaultValue": "",
+//      "isOverridable": false,
+//      "displayType": "masterHost",
+//      "isRequiredByAgent": false,
+//      "isVisible": true,
+//      "serviceName": "YARN",
+//      "category": "AppTimelineServer",
+//      "index": 0
+//    },
+//    {
+//      "id": "puppet var",
+//      "name": "ats_server_port",
+//      "displayName": "Server port",
+//      "description": "Application Timeline Server port",
+//      "defaultValue": "9292", // @todo add correct value APP_TIMELINE_SERVER.port
+//      "isOverridable": false,
+//      "displayType": "int",
+//      "isRequiredByAgent": false,
+//      "isVisible": true,
+//      "serviceName": "YARN",
+//      "category": "AppTimelineServer",
+//      "index": 1
+//    },
   /**********************************************HBASE***************************************/
     {
       "id": "puppet var",
@@ -1702,3 +1703,35 @@ module.exports =
 
   ]
 };
+// @todo remove after App Timeline service integration
+if (App.supports.appTimelineServer) {
+  module.exports.configProperties.push(
+      {
+        "id": "puppet var",
+        "name": "ats_host",
+        "displayName": "App Timeline Server",
+        "description": "Application Timeline Server Host",
+        "defaultValue": "",
+        "isOverridable": false,
+        "displayType": "masterHost",
+        "isRequiredByAgent": false,
+        "isVisible": true,
+        "serviceName": "YARN",
+        "category": "AppTimelineServer",
+        "index": 0
+      },
+      {
+        "id": "puppet var",
+        "name": "ats_server_port",
+        "displayName": "Server port",
+        "description": "Application Timeline Server port",
+        "defaultValue": "9292",
+        "isOverridable": false,
+        "displayType": "int",
+        "isRequiredByAgent": false,
+        "isVisible": true,
+        "serviceName": "YARN",
+        "category": "AppTimelineServer",
+        "index": 1
+      });
+}