Merge "[CE-248] changes to configtx.j2 in cello ansible"

hyperledger-cello · Jan 25, 2018 · 5728a91 · 5728a91
2 parents ee2a67d + 20d7016
commit 5728a91
Showing 1 changed file with 23 additions and 2 deletions.
diff --git a/src/agent/ansible/roles/deploy_compose/certsetup/templates/configtx.j2 b/src/agent/ansible/roles/deploy_compose/certsetup/templates/configtx.j2
@@ -38,6 +38,10 @@ Orderer: &OrdererDefaults
 {% for org in ordererorgs %}
     - *{{ org }}
 {% endfor %}
+{% if project_version | version_compare('1.1.0','>=') %}
+  Capabilities:
+    <<: *OrdererCapabilities
+{% endif %}
 
 Application: &ApplicationDefaults
   Organizations:
@@ -50,14 +54,31 @@ Profiles:
     Consortium: FabricConsortium
     Application:
       <<: *ApplicationDefaults
-
+{% if project_version | version_compare('1.1.0','>=') %}
+    Capabilities:
+      <<: *ApplicationCapabilities
+{% endif %}
   OrdererGenesis:
     Orderer:
       <<: *OrdererDefaults
-
+{% if project_version | version_compare('1.1.0','>=') %}
+    Capabilities:
+      <<: *ChannelCapabilities
+{% endif %}
     Consortiums:
       FabricConsortium:
         Organizations:
 {%   for org in peerorgs %}
           - *{{ org }}
 {%   endfor %}
+{% if project_version | version_compare('1.1.0','>=') %}
+Capabilities:
+  Global: &ChannelCapabilities
+    V1_1: true
+
+  Orderer: &OrdererCapabilities
+    V1_1: true
+
+  Application: &ApplicationCapabilities
+    V1_1: true
+{% endif %}