AMBARI-4899: Remove non-required global properties related to GLUSTERFS. (jaimin)

ambari-server/src/main/resources/stacks/HDP/1.3.2.GlusterFS/services/GLUSTERFS/configuration/core-site.xml

@@ -248,4 +248,30 @@ DEFAULT
   </description>
 </property>
 -->
+
+  <property>
+    <name>fs.glusterfs.impl</name>
+    <value>org.apache.hadoop.fs.glusterfs.GlusterFileSystem</value>
+    <description>GlusterFS fs impl</description>
+  </property>
+
+  <property>
+    <name>fs.glusterfs.volname</name>
+    <value>HadoopVol</value>
+    <description>GlusterFS volume name</description>
+  </property>
+
+  <property>
+    <name>fs.glusterfs.mount</name>
+    <value>/mnt/glusterfs</value>
+    <description>GlusterFS mount point</description>
+  </property>
+
+  <property>
+    <name>fs.glusterfs.getfattrcmd</name>
+    <value>sudo getfattr -m . -n trusted.glusterfs.pathinfo</value>
+    <description>GlusterFS getfattr command</description>
+  </property>
+
+
 </configuration>

ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml

@@ -78,21 +78,37 @@
 <property>
 <name>gluster.daemon.user</name>
 <value>yarn</value>
+<description>GlusterFS Daemon user</description>
 </property>
 
 <property>
 <name>fs.AbstractFileSystem.glusterfs.impl</name>
 <value>org.apache.hadoop.fs.local.GlusterFs</value>
+<description>GlusterFS Abstract Filesystem declaration</description>
 </property>
 
 <property>
 <name>fs.glusterfs.impl</name>
 <value>org.apache.hadoop.fs.glusterfs.GlusterFileSystem</value>
+  <description>GlusterFS fs impl</description>
+</property>
+
+<property>
+<name>fs.glusterfs.volname</name>
+<value>HadoopVol</value>
+<description>GlusterFS volume name</description>
 </property>
 
 <property>
 <name>fs.glusterfs.mount</name>
 <value>/mnt/glusterfs</value>
+<description>GlusterFS mount point</description>
+</property>
+
+<property>
+<name>fs.glusterfs.getfattrcmd</name>
+<value>sudo getfattr -m . -n trusted.glusterfs.pathinfo</value>
+<description>GlusterFS getfattr command</description>
 </property>
 
 

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

@@ -103,58 +103,6 @@ var configs = [
     "filename": "oozie-site.xml",
     "isOverridable": true,
     "serviceName": "OOZIE"
-  },
-
-
-
-/********************GLUSTERFS*************************************/
-  {
-    "name": "fs.glusterfs.impl",
-    "templateName": ["fs_glusterfs_impl"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "core-site.xml",
-    "serviceName": "GLUSTERFS"
-  },
-  {
-    "name": "fs.glusterfs.volname",
-    "templateName": ["fs_glusterfs_volname"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "core-site.xml",
-    "serviceName": "GLUSTERFS"
-  },
-  {
-    "name": "fs.glusterfs.mount",
-    "templateName": ["fs_glusterfs_mount"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "core-site.xml",
-    "serviceName": "GLUSTERFS"
-  },
-  {
-    "name": "fs.glusterfs.getfattrcmd",
-    "templateName": ["fs_glusterfs_getfattrcmd"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "core-site.xml",
-    "serviceName": "GLUSTERFS"
-  },
-  {
-    "name": "fs.AbstractFileSystem.glusterfs.impl",
-    "templateName": ["fs_AbstractFileSystem_glusterfs_impl"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "core-site.xml",
-    "serviceName": "GLUSTERFS"
-  },
-  {
-    "name": "gluster.daemon.user",
-    "templateName": ["gluster_daemon_user"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "core-site.xml",
-    "serviceName": "GLUSTERFS"
   }
 ];
 

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

@@ -538,78 +538,6 @@ module.exports =
         "serviceName": "GLUSTERFS",
         "category": "General"
       },
-    {
-      "id": "puppet var",
-      "name": "fs_glusterfs_volname",
-      "displayName": "GlusterFS volume name",
-      "description": "GlusterFS volume name",
-      "defaultValue": "HadoopVol",
-      "displayType": "string",
-      "isVisible": true,
-      "domain": "global",
-      "serviceName": "GLUSTERFS",
-      "category": "General"
-    },
-    {
-        "id": "puppet var",
-        "name": "fs_glusterfs_mount",
-        "displayName": "GlusterFS mount point",
-        "description": "GlusterFS mount point",
-        "defaultValue": "/mnt/glusterfs",
-        "displayType": "string",
-        "isVisible": true,
-        "domain": "global",
-        "serviceName": "GLUSTERFS",
-        "category": "General"
-      },
-      {
-        "id": "puppet var",
-        "name": "fs_glusterfs_impl",
-        "displayName": "GlusterFS fs impl",
-        "description": "GlusterFS fs impl",
-        "defaultValue": "org.apache.hadoop.fs.glusterfs.GlusterFileSystem",
-        "displayType": "string",
-        "isVisible": true,
-        "domain": "global",
-        "serviceName": "GLUSTERFS",
-        "category": "General"
-      },
-      {
-        "id": "puppet var",
-        "name": "fs_glusterfs_getfattrcmd",
-        "displayName": "GlusterFS getfattr command",
-        "description": "GlusterFS getfattr command",
-        "defaultValue": "sudo getfattr -m . -n trusted.glusterfs.pathinfo",
-        "displayType": "string",
-        "isVisible": true,
-        "domain": "global",
-        "serviceName": "GLUSTERFS",
-        "category": "General"
-      },
-      {
-          "id": "puppet var",
-          "name": "fs_AbstractFileSystem_glusterfs_impl",
-          "displayName": "GlusterFS Abstract Filesystem declaration",
-          "description": "GlusterFS Abstract Filesystem declaration",
-          "defaultValue": "org.apache.hadoop.fs.local.GlusterFs",
-          "displayType": "string",
-          "isVisible": true,
-          "domain": "global",
-          "serviceName": "GLUSTERFS",
-          "category": "General"
-        },
-        {
-            "id": "puppet var",
-            "name": "gluster_daemon_user",
-            "displayName": "GlusterFS Daemon user",
-            "description": "GlusterFS Daemon user",
-            "defaultValue": "yarn",
-            "displayType": "string",
-            "isVisible": true,
-            "domain": "global",
-            "serviceName": "GLUSTERFS",
-            "category": "General"
-          },
           {
             "id": "puppet var",
             "name": "hadoop_heapsize",

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

@@ -21,6 +21,7 @@ var App = require('app');
 module.exports =
 {
   "configProperties": [
+  //***************************************** HDP stack **************************************
   /**********************************************HDFS***************************************/
     {
       "id": "site property",
@@ -1501,6 +1502,66 @@ module.exports =
       "serviceName": "PIG",
       "filename": "pig-log4j.xml",
       "category": "AdvancedPigLog4j"
+    },
+
+
+
+    //***************************************** GLUSTERFS stack********************************************
+
+    {
+      "id": "site property",
+      "name": "fs.glusterfs.impl",
+      "displayName": "GlusterFS fs impl",
+      "displayType": "string",
+      "filename": "core-site.xml",
+      "serviceName": "GLUSTERFS",
+      "category": "General"
+    },
+    {
+      "id": "site property",
+      "name": "fs.glusterfs.volname",
+      "displayName": "GlusterFS volume name",
+      "displayType": "string",
+      "filename": "core-site.xml",
+      "serviceName": "GLUSTERFS",
+      "category": "General"
+    },
+    {
+      "id": "site property",
+      "name": "fs.glusterfs.mount",
+      "displayName": "GlusterFS mount point",
+      "displayType": "string",
+      "filename": "core-site.xml",
+      "serviceName": "GLUSTERFS",
+      "category": "General"
+    },
+    {
+      "id": "site property",
+      "name": "fs.glusterfs.getfattrcmd",
+      "displayName": "GlusterFS getfattr command",
+      "displayType": "string",
+      "filename": "core-site.xml",
+      "serviceName": "GLUSTERFS",
+      "category": "General"
+    },
+    {
+      "id": "site property",
+      "name": "fs.AbstractFileSystem.glusterfs.impl",
+      "displayName": "GlusterFS Abstract Filesystem declaration",
+      "displayType": "string",
+      "filename": "core-site.xml",
+      "serviceName": "GLUSTERFS",
+      "category": "General"
+    },
+    {
+      "id": "site property",
+      "name": "gluster.daemon.user",
+      "displayName": "GlusterFS Daemon user",
+      "displayType": "string",
+      "filename": "core-site.xml",
+      "serviceName": "GLUSTERFS",
+      "category": "General"
     }
+
   ]
 };

ambari-web/app/data/config_mapping.js

@@ -65,36 +65,6 @@ var configs = [
     "value": "<templateName[0]>",
     "filename": "core-site.xml",
     "isOverridable" : true
-  },
-
-/**********************************************core-site for glusterfs***************************************/
-  {
-    "name": "fs.glusterfs.impl",
-    "templateName": ["fs_glusterfs_impl"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "core-site.xml"
-  },
-  {
-    "name": "fs.glusterfs.volname",
-    "templateName": ["fs_glusterfs_volname"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "core-site.xml"
-  },
-  {
-    "name": "fs.glusterfs.mount",
-    "templateName": ["fs_glusterfs_mount"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "core-site.xml"
-  },
-  {
-    "name": "fs.glusterfs.getfattrcmd",
-    "templateName": ["fs_glusterfs_getfattrcmd"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "core-site.xml"
   }
 ];
 

ambari-web/app/data/global_properties.js

@@ -272,54 +272,6 @@ module.exports =
           "serviceName": "GLUSTERFS",
           "category": "General"
         },
-      {
-        "id": "puppet var",
-        "name": "fs_glusterfs_volname",
-        "displayName": "GlusterFS volume name",
-        "description": "GlusterFS volume name",
-        "defaultValue": "HadoopVol",
-        "displayType": "string",
-        "isVisible": true,
-        "domain": "global",
-        "serviceName": "GLUSTERFS",
-        "category": "General"
-      },
-      {
-          "id": "puppet var",
-          "name": "fs_glusterfs_mount",
-          "displayName": "GlusterFS mount point",
-          "description": "GlusterFS mount point",
-          "defaultValue": "/mnt/glusterfs",
-          "displayType": "string",
-          "isVisible": true,
-          "domain": "global",
-          "serviceName": "GLUSTERFS",
-          "category": "General"
-        },
-        {
-          "id": "puppet var",
-          "name": "fs_glusterfs_impl",
-          "displayName": "GlusterFS fs impl",
-          "description": "GlusterFS fs impl",
-          "defaultValue": "org.apache.hadoop.fs.glusterfs.GlusterFileSystem",
-          "displayType": "string",
-          "isVisible": true,
-          "domain": "global",
-          "serviceName": "GLUSTERFS",
-          "category": "General"
-        },
-        {
-          "id": "puppet var",
-          "name": "fs_glusterfs_getfattrcmd",
-          "displayName": "GlusterFS getfattr command",
-          "description": "GlusterFS getfattr command",
-          "defaultValue": "sudo getfattr -m . -n trusted.glusterfs.pathinfo",
-          "displayType": "string",
-          "isVisible": true,
-          "domain": "global",
-          "serviceName": "GLUSTERFS",
-          "category": "General"
-        },
         {
             "id": "puppet var",
             "name": "fs_AbstractFileSystem_glusterfs_impl",

ambari-web/app/data/site_properties.js

@@ -834,6 +834,46 @@ module.exports =
       "serviceName": "PIG",
       "filename": "pig-log4j.xml",
       "category": "AdvancedPigLog4j"
+    },
+
+
+    //***************************************** GLUSTERFS stack********************************************
+    {
+      "id": "site property",
+      "name": "fs.glusterfs.impl",
+      "displayName": "GlusterFS fs impl",
+      "displayType": "string",
+      "filename": "core-site.xml",
+      "serviceName": "GLUSTERFS",
+      "category": "General"
+    },
+    {
+      "id": "site property",
+      "name": "fs.glusterfs.volname",
+      "displayName": "GlusterFS volume name",
+      "displayType": "string",
+      "filename": "core-site.xml",
+      "serviceName": "GLUSTERFS",
+      "category": "General"
+    },
+    {
+      "id": "site property",
+      "name": "fs.glusterfs.mount",
+      "displayName": "GlusterFS mount point",
+      "displayType": "string",
+      "filename": "core-site.xml",
+      "serviceName": "GLUSTERFS",
+      "category": "General"
+    },
+    {
+      "id": "site property",
+      "name": "fs.glusterfs.getfattrcmd",
+      "displayName": "GlusterFS getfattr command",
+      "displayType": "string",
+      "filename": "core-site.xml",
+      "serviceName": "GLUSTERFS",
+      "category": "General"
     }
+
   ]
 };