Skip to content

Commit

Permalink
[CE-414] adding V1_3 capabilities to ansible agent
Browse files Browse the repository at this point in the history
Adding V1_3 capabilities to ansible agent to configtx.j2

Change-Id: I13a480c8c8d80b28e92dc4d91bf000b15847900c
Signed-off-by: Surya Lanka <suryalnvs@gmail.com>
  • Loading branch information
suryalnvs committed Nov 2, 2018
1 parent be8d6b6 commit af989e2
Showing 1 changed file with 11 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit af989e2

Please sign in to comment.