[FAB-10176] Fix invalid configtx.yaml documents

Change-Id: Ibf52f9380ed3b724c594b53550321a12475e9860 Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
hyperledger · May 17, 2018 · e2f4f20 · e2f4f20
1 parent c3979b5
commit e2f4f20
Show file tree

Hide file tree

Showing 3 changed files with 194 additions and 193 deletions.
diff --git a/balance-transfer/artifacts/channel/configtx.yaml b/balance-transfer/artifacts/channel/configtx.yaml
@@ -6,31 +6,48 @@
 ---
 ################################################################################
 #
-# 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
 
- TwoOrgsOrdererGenesis:
- Orderer:
- <<: *OrdererDefaults
- Organizations:
- - *OrdererOrg
- Consortiums:
- SampleConsortium:
- Organizations:
- - *Org1
- - *Org2
- TwoOrgsChannel:
- Consortium: SampleConsortium
- Application:
- <<: *ApplicationDefaults
- Organizations:
- - *Org1
- - *Org2
+ # Orderer Type: The orderer implementation to start
+ # Available types are "solo" and "kafka"
+ OrdererType: solo
+
+ Addresses:
+ - orderer.example.com: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
+ # NOTE: Use IP:port notation
+ Brokers:
+ - 127.0.0.1:9092
+
+ # Organizations is the list of orgs which are defined as participants on
+ # the orderer side of the network
+ Organizations:
 
 ################################################################################
 #
@@ -91,59 +108,42 @@ 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.example.com: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
- # NOTE: Use IP:port notation
- Brokers:
- - 127.0.0.1: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:
+ TwoOrgsOrdererGenesis:
+ Orderer:
+ <<: *OrdererDefaults
+ Organizations:
+ - *OrdererOrg
+ Consortiums:
+ SampleConsortium:
+ Organizations:
+ - *Org1
+ - *Org2
+ TwoOrgsChannel:
+ Consortium: SampleConsortium
+ Application:
+ <<: *ApplicationDefaults
+ Organizations:
+ - *Org1
+ - *Org2
diff --git a/basic-network/configtx.yaml b/basic-network/configtx.yaml
@@ -6,29 +6,48 @@
 ---
 ################################################################################
 #
-# 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
 
- OneOrgOrdererGenesis:
- Orderer:
- <<: *OrdererDefaults
- Organizations:
- - *OrdererOrg
- Consortiums:
- SampleConsortium:
- Organizations:
- - *Org1
- OneOrgChannel:
- Consortium: SampleConsortium
- Application:
- <<: *ApplicationDefaults
- Organizations:
- - *Org1
+ # Orderer Type: The orderer implementation to start
+ # Available types are "solo" and "kafka"
+ OrdererType: solo
+
+ Addresses:
+ - orderer.example.com: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: 99 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
+ # NOTE: Use IP:port notation
+ Brokers:
+ - 127.0.0.1:9092
+
+ # Organizations is the list of orgs which are defined as participants on
+ # the orderer side of the network
+ Organizations:
 
 ################################################################################
 #
@@ -72,59 +91,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.example.com: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: 99 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
- # NOTE: Use IP:port notation
- Brokers:
- - 127.0.0.1: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:
+
+ OneOrgOrdererGenesis:
+ Orderer:
+ <<: *OrdererDefaults
+ Organizations:
+ - *OrdererOrg
+ Consortiums:
+ SampleConsortium:
+ Organizations:
+ - *Org1
+ OneOrgChannel:
+ Consortium: SampleConsortium
+ Application:
+ <<: *ApplicationDefaults
+ Organizations:
+ - *Org1
 
- # Organizations is the list of orgs which are defined as participants on
- # the application side of the network
- Organizations: