AMBARI-4833. Falcon: core-site needs hadoop.proxyuser.<falcon-username>.hosts=* and hadoop.proxyuser.<falcon-username>.groups=<proxy-group>. (jaimin)

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

@@ -67,6 +67,22 @@ var configs = [
     "filename": "core-site.xml",
     "isOverridable": true
   },
+  {
+    "name": "hadoop.proxyuser.<foreignKey[0]>.groups",
+    "templateName": ["proxyuser_group"],
+    "foreignKey": ["falcon_user"],
+    "value": "<templateName[0]>",
+    "filename": "core-site.xml",
+    "isOverridable": true
+  },
+  {
+    "name": "hadoop.proxyuser.<foreignKey[0]>.hosts",
+    "templateName": ["falconserver_host"],
+    "foreignKey": ["falcon_user"],
+    "value": "<templateName[0]>",
+    "filename": "core-site.xml",
+    "isOverridable": true
+  },
   /********************GLUSTERFS*************************************/
   {
     "name": "fs.glusterfs.impl",

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

@@ -1326,14 +1326,13 @@ module.exports =
   /**********************************************FALCON***************************************/
     {
       "id": "puppet var",
-      "name": "falcon_user",
-      "displayName": "Falcon user",
-      "description": "",
+      "name": "falconserver_host",
+      "displayName": "Falcon Server",
+      "description": "The host that has been assigned to run Falcon Server",
       "defaultValue": "falcon",
-      "isReconfigurable": true,
-      "displayType": "user",
+      "displayType": "masterHost",
       "isVisible": true,
-      "isRequiredByAgent": true,
+      "isRequiredByAgent": false,
       "serviceName": "FALCON",
       "category": "Falcon"
     },
@@ -1519,7 +1518,7 @@ module.exports =
     {
       "id": "puppet var",
       "name": "proxyuser_group",
-      "displayName": "Proxy group for Hive, WebHCat, and Oozie",
+      "displayName": "Proxy group for Hive, WebHCat, Oozie and Falcon",
       "description": "",
       "defaultValue": "users",
       "isReconfigurable": false,
@@ -1529,7 +1528,7 @@ module.exports =
       "filename": "core-site.xml",
       "serviceName": "MISC",
       "category": "Users and Groups",
-      "belongsToService":["HIVE","WEBHCAT","OOZIE"]
+      "belongsToService":["HIVE","WEBHCAT","OOZIE","FALCON"]
     },
     {
       "id": "puppet var",
@@ -1656,6 +1655,34 @@ module.exports =
       "category": "Users and Groups",
       "belongsToService":["OOZIE"]
     },
+    {
+      "id": "puppet var",
+      "name": "falcon_user",
+      "displayName": "Falcon User",
+      "description": "User to run Falcon as",
+      "defaultValue": "falcon",
+      "isReconfigurable": false,
+      "displayType": "user",
+      "isOverridable": false,
+      "isVisible": true,
+      "serviceName":"MISC",
+      "category": "Users and Groups",
+      "belongsToService":["FALCON"]
+    },
+    {
+      "id": "puppet var",
+      "name": "storm_user",
+      "displayName": "Storm User",
+      "description": "User to run Storm as",
+      "defaultValue": "storm",
+      "isReconfigurable": false,
+      "displayType": "user",
+      "isOverridable": false,
+      "isVisible": true,
+      "serviceName":"MISC",
+      "category": "Users and Groups",
+      "belongsToService":["STORM"]
+    },
     {
       "id": "puppet var",
       "name": "zk_user",
@@ -1754,34 +1781,6 @@ module.exports =
       "category": "Users and Groups",
       "belongsToService":["HDFS"]
     },
-    {
-      "id": "puppet var",
-      "name": "storm_user",
-      "displayName": "Storm User",
-      "description": "User to run Storm as",
-      "defaultValue": "storm",
-      "isReconfigurable": false,
-      "displayType": "user",
-      "isOverridable": false,
-      "isVisible": true,
-      "serviceName":"MISC",
-      "category": "Users and Groups",
-      "belongsToService":["STORM"]
-    },
-    {
-      "id": "puppet var",
-      "name": "falcon_user",
-      "displayName": "Falcon User",
-      "description": "User to run Falcon as",
-      "defaultValue": "falcon",
-      "isReconfigurable": false,
-      "displayType": "user",
-      "isOverridable": false,
-      "isVisible": true,
-      "serviceName":"MISC",
-      "category": "Users and Groups",
-      "belongsToService":["FALCON"]
-    },
     {
       "id": "puppet var",
       "name": "rrdcached_base_dir",

ambari-web/app/models/service_config.js

@@ -410,7 +410,7 @@ App.ServiceConfigProperty = Ember.Object.extend({
       case 'nimbus.host':
         this.set('value', masterComponentHostsInDB.findProperty('component', 'NIMBUS').hostName);
         break;
-      case 'falconserver.host':
+      case 'falconserver_host':
         this.set('value', masterComponentHostsInDB.findProperty('component', 'FALCON_SERVER').hostName);
         break;
       case 'logviewerserver_host':