From af989e21961662252d250672a80e206a8173225b Mon Sep 17 00:00:00 2001
From: Surya Lanka <suryalnvs@gmail.com>
Date: Fri, 2 Nov 2018 17:19:54 -0400
Subject: [PATCH] [CE-414] adding V1_3 capabilities to ansible agent

Adding V1_3 capabilities to ansible agent to configtx.j2

Change-Id: I13a480c8c8d80b28e92dc4d91bf000b15847900c
Signed-off-by: Surya Lanka <suryalnvs@gmail.com>
---
 .../certsetup/templates/configtx.j2              | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 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
index 1cc6eded..fb83cfa9 100755
--- a/src/agent/ansible/roles/deploy_compose/certsetup/templates/configtx.j2
+++ b/src/agent/ansible/roles/deploy_compose/certsetup/templates/configtx.j2
@@ -51,13 +51,19 @@ Organizations:
 {% if project_version is version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
 Capabilities:
   Global: &ChannelCapabilities
+{% if project_version is version_compare('1.3.0','>=') or 'stable' in project_version or project_version == 'latest' %}
+    V1_3: true
+{% elif project_version is version_compare('1.1.0','>=') and project_version is version_compare('1.3.0','<') %}
     V1_1: true
+{% endif %}
 
   Orderer: &OrdererCapabilities
     V1_1: true
 
   Application: &ApplicationCapabilities
-{% if project_version is version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %}
+{% if project_version is version_compare('1.3.0','>=') or 'stable' in project_version or project_version == 'latest' %}
+    V1_3: true
+{% elif project_version is version_compare('1.2.0','>=') and project_version is version_compare('1.3.0','<') %}
     V1_2: true
 {% elif project_version is version_compare('1.1.0','>=') and project_version is version_compare('1.2.0','<') %}
     V1_1: true
@@ -123,6 +129,10 @@ Application: &ApplicationDefaults
           Type: ImplicitMeta
           Rule: "MAJORITY Admins"
 {% endif %}
+{% if project_version is version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
+    Capabilities:
+      <<: *ApplicationCapabilities
+{% endif %}
 
 {% if project_version is version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %}
 Channel: &ChannelDefaults
@@ -143,10 +153,6 @@ Profiles:
     Consortium: FabricConsortium
     Application:
       <<: *ApplicationDefaults
-{% if project_version is version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
-    Capabilities:
-      <<: *ApplicationCapabilities
-{% endif %}
   OrdererGenesis:
 {% if project_version is version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %}
     <<: *ChannelDefaults