Skip to content

Commit

Permalink
[#70]Fixed the capability version string
Browse files Browse the repository at this point in the history
Signed-off-by: Tong Li <litong01@us.ibm.com>
  • Loading branch information
Tong Li committed Nov 14, 2019
1 parent 541c4cb commit e64a9a3
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions src/agent/ansible/roles/deploy_k8s/certsetup/templates/configtx.j2
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,27 @@ 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.4.0','>=') or 'stable' in project_version or project_version == 'latest' %}
V1_4: true
{% elif project_version is version_compare('1.3.0','>=') and project_version is version_compare('1.4.0','<') %}
{% if project_version is version_compare('1.4.3','>=') %}
V1_4_3: true
{% elif project_version is version_compare('1.4.2','>=') and project_version is version_compare('1.4.3','<') %}
V1_4_2: true
{% elif project_version is version_compare('1.3.0','>=') and project_version is version_compare('1.4.2','<') %}
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
{% if project_version is version_compare('1.4.2','>=') %}
V1_4_2: true
{% else %}
V1_1: true
{% endif %}

Application: &ApplicationCapabilities
{% if project_version is version_compare('1.4.0','>=') or 'stable' in project_version or project_version == 'latest' %}
V1_4: true
{% elif project_version is version_compare('1.3.0','>=') and project_version is version_compare('1.4.0','<') %}
{% if project_version is version_compare('1.4.2','>=') %}
V1_4_2: true
{% elif project_version is version_compare('1.3.0','>=') and project_version is version_compare('1.4.1','<=') %}
V1_3: true
{% elif project_version is version_compare('1.2.0','>=') and project_version is version_compare('1.3.0','<') %}
V1_2: true
Expand Down

0 comments on commit e64a9a3

Please sign in to comment.