HDFS-12080. Ozone: Fix UT failure in TestOzoneConfigurationFields. Contributed by Mukul Kumar Singh.

hadoop-hdfs-project/hadoop-hdfs/src/main/resources/ozone-default.xml

@@ -167,21 +167,6 @@
     </description>
   </property>
 
-  <property>
-    <name>ozone.scm.internal.bind.host</name>
-    <value>0.0.0.0</value>
-    <description>
-      The hostname or IP address used by the SCM DataNode handler service
-      to bind. This setting is used by the SCM only and never used by
-      clients or Data Nodes.
-
-      The setting can be useful in multi-homed setups to restrict the
-      availability of the SCM to a specific interface.
-
-      The default is appropriate for most clusters.
-    </description>
-  </property>
-
   <property>
     <name>ozone.scm.block.client.address</name>
     <value></value>
@@ -586,6 +571,38 @@
     <description>
       The address that cblock will be bind to, should be a host:port format,
       this setting is required for cblock server to start.
+      This address is used for cblock management operations like create,
+      delete, info and list volumes
+    </description>
+  </property>
+
+  <property>
+    <name>dfs.cblock.service.rpc-bind-host</name>
+    <value>0.0.0.0</value>
+    <description>
+      The actual address the cblock service rpc server will bind to. If this
+      optional address is set, it overrides only the hostname portion of
+      dfs.cblock.servicerpc-address.
+    </description>
+  </property>
+
+  <property>
+    <name>dfs.cblock.jscsi-address</name>
+    <value></value>
+    <description>
+      The address that cblock will be bind to, should be a host:port format,
+      this setting is required for cblock server to start.
+      This address to be used by jscsi to mount volume.
+    </description>
+  </property>
+
+  <property>
+    <name>dfs.cblock.jscsi.rpc-bind-host</name>
+    <value>0.0.0.0</value>
+    <description>
+      The actual address the cblock jscsi rpc server will bind to. If this
+      optional address is set, it overrides only the hostname portion of
+      dfs.cblock.jscsi-address.
     </description>
   </property>
 
@@ -737,4 +754,20 @@
       The maximum number of retries when writing a block to container.
     </description>
   </property>
+
+  <property>
+    <name>dfs.cblock.scm.ipaddress</name>
+    <value>127.0.0.1</value>
+    <description>
+      IP address used by cblock to connect to SCM.
+    </description>
+  </property>
+
+  <property>
+    <name>dfs.cblock.scm.port</name>
+    <value>9860</value>
+    <description>
+      Port used by cblock to connect to SCM.
+    </description>
+  </property>
 </configuration>