[FAB-10151] reorder sections in configtx.yaml

Most of the configtx.yaml documents in the tree contained invalid YAML.
This wasn't detected before now because bugs in go-yaml have hidden the
issue. These changes need to be made before the parser is bumped to help
ensure things don't break.

A draft release note has been added to the tree to highlight the issue
as we approach the end of our current release cycle.

Change-Id: I8d9cd9e2278ccd51ffd136fd17e3d858f6b56b2d
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>

Author: sykesm

examples/cluster/config/configtx.yaml

@@ -6,30 +6,51 @@
 ---
 ################################################################################
 #
-#   Profile
+#   SECTION: Orderer
 #
-#   - Different configuration profiles may be encoded here to be specified
-#   as parameters to the configtxgen tool
+#   - This section defines the values to encode into a config transaction or
+#   genesis block for orderer related parameters
 #
 ################################################################################
-Profiles:
+Orderer: &OrdererDefaults
 
-    SampleOrg:
-      Orderer:
-        <<: *OrdererDefaults
-        Organizations:
-          - *OrdererOrg
-      Consortiums:
-        SampleConsortium:
-          Organizations:
-            - *OrdererOrg
-            - *Org1
+    # Orderer Type: The orderer implementation to start
+    # Available types are "solo" and "kafka"
+    OrdererType: solo
 
-    SampleChannel:
-      Consortium: SampleConsortium
-      Application:
-        Organizations:
-          - *Org1
+    Addresses:
+        - orderer:7050
+
+    # Batch Timeout: The amount of time to wait before creating a batch
+    BatchTimeout: 2s
+
+    # Batch Size: Controls the number of messages batched into a block
+    BatchSize:
+
+        # Max Message Count: The maximum number of messages to permit in a batch
+        MaxMessageCount: 10
+
+        # Absolute Max Bytes: The absolute maximum number of bytes allowed for
+        # the serialized messages in a batch.
+        AbsoluteMaxBytes: 98 MB
+
+        # Preferred Max Bytes: The preferred maximum number of bytes allowed for
+        # the serialized messages in a batch. A message larger than the preferred
+        # max bytes will result in a batch larger than preferred max bytes.
+        PreferredMaxBytes: 512 KB
+
+    Kafka:
+        # Brokers: A list of Kafka brokers to which the orderer connects. Edit
+        # this list to identify the brokers of the ordering service.
+        # NOTE: Use IP:port notation.
+        Brokers:
+            - kafka0:9092
+            - kafka1:9092
+            - kafka2:9092
+
+    # Organizations is the list of orgs which are defined as participants on
+    # the orderer side of the network
+    Organizations:
 
 ################################################################################
 #
@@ -77,62 +98,41 @@ Organizations:
 
 ################################################################################
 #
-#   SECTION: Orderer
+#   SECTION: Application
 #
 #   - This section defines the values to encode into a config transaction or
-#   genesis block for orderer related parameters
+#   genesis block for application related parameters
 #
 ################################################################################
-Orderer: &OrdererDefaults
-
-    # Orderer Type: The orderer implementation to start
-    # Available types are "solo" and "kafka"
-    OrdererType: solo
-
-    Addresses:
-        - orderer:7050
-
-    # Batch Timeout: The amount of time to wait before creating a batch
-    BatchTimeout: 2s
-
-    # Batch Size: Controls the number of messages batched into a block
-    BatchSize:
-
-        # Max Message Count: The maximum number of messages to permit in a batch
-        MaxMessageCount: 10
-
-        # Absolute Max Bytes: The absolute maximum number of bytes allowed for
-        # the serialized messages in a batch.
-        AbsoluteMaxBytes: 98 MB
-
-        # Preferred Max Bytes: The preferred maximum number of bytes allowed for
-        # the serialized messages in a batch. A message larger than the preferred
-        # max bytes will result in a batch larger than preferred max bytes.
-        PreferredMaxBytes: 512 KB
-
-    Kafka:
-        # Brokers: A list of Kafka brokers to which the orderer connects. Edit
-        # this list to identify the brokers of the ordering service.
-        # NOTE: Use IP:port notation.
-        Brokers:
-            - kafka0:9092
-            - kafka1:9092
-            - kafka2:9092
+Application: &ApplicationDefaults
 
     # Organizations is the list of orgs which are defined as participants on
-    # the orderer side of the network
+    # the application side of the network
     Organizations:
 
 ################################################################################
 #
-#   SECTION: Application
+#   Profile
 #
-#   - This section defines the values to encode into a config transaction or
-#   genesis block for application related parameters
+#   - Different configuration profiles may be encoded here to be specified
+#   as parameters to the configtxgen tool
 #
 ################################################################################
-Application: &ApplicationDefaults
+Profiles:
 
-    # Organizations is the list of orgs which are defined as participants on
-    # the application side of the network
-    Organizations:
+    SampleOrg:
+      Orderer:
+        <<: *OrdererDefaults
+        Organizations:
+          - *OrdererOrg
+      Consortiums:
+        SampleConsortium:
+          Organizations:
+            - *OrdererOrg
+            - *Org1
+
+    SampleChannel:
+      Consortium: SampleConsortium
+      Application:
+        Organizations:
+          - *Org1