[CE-376] Changes to cello/ansible k8s

Added code to support pulling images from private repository for deploying fabric network using ansible/k8s Added docker pod for hosting all chaincode containers in fabric-pod.yml to avoid sharing worker node docker host config as some cloud kubernetes cluster may not allow sharing host config. Added newly added parameters to core.yaml, configtx.yaml, crypto-config.yaml for v1.2 Change-Id: I208c821dc1672fa699a553a44c34cee6cc0bb159 Signed-off-by: Surya <suryalnvs@gmail.com>
hyperledger · May 31, 2018 · 85b3974 · 85b3974
1 parent 9162c3d
commit 85b3974
Show file tree

Hide file tree

Showing 7 changed files with 276 additions and 53 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
@@ -7,16 +7,52 @@ Organizations:
     Name: {{ org }}
     ID: {{ org }}
     MSPDir: {{ fabricworkdir }}/keyfiles/{{ org }}/msp
-    AdminPrincipal: Role.ADMIN
-    {% if org_anchor[org] is defined -%}
+{% if org_anchor[org] is defined %}
+    Policies:
+        Readers:
+            Type: Signature
+            Rule: "OR('{{ org }}.admin', '{{ org }}.peer')"
+        Writers:
+            Type: Signature
+            Rule: "OR('{{ org }}.admin', '{{ org }}.client')"
+        Admins:
+            Type: Signature
+            Rule: "OR('{{ org }}.admin')"
     AnchorPeers:
       - Host: {{ org_anchor[org].name }}
         Port: 7051
-    {% endif %}
+{% else %}
+    Policies:
+        Readers:
+            Type: Signature
+            Rule: "OR('{{ org }}.member')"
+        Writers:
+            Type: Signature
+            Rule: "OR('{{ org }}.member')"
+        Admins:
+            Type: Signature
+            Rule: "OR('{{ org }}.admin')"
+{% endif %}
 
 {% endfor %}
 {% endif %}
 
+{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
+Capabilities:
+  Global: &ChannelCapabilities
+    V1_1: true
+
+  Orderer: &OrdererCapabilities
+    V1_1: true
+{% endif %}
+
+{% if project_version | version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %}
+  Application: &ApplicationCapabilities
+    V1_2: true
+{% elif project_version | version_compare('1.1.0','>=') and project_version | version_compare('1.2.0','<') %}
+    V1_1: true
+{% endif %}
+
 Orderer: &OrdererDefaults
   OrdererType: kafka
   Addresses:
@@ -39,7 +75,22 @@ Orderer: &OrdererDefaults
 {% for org in ordererorgs %}
     - *{{ org }}
 {% endfor %}
-{% if project_version | version_compare('1.1.0','>=') %}
+{% if project_version | version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %}
+  Policies:
+      Readers:
+          Type: ImplicitMeta
+          Rule: "ANY Readers"
+      Writers:
+          Type: ImplicitMeta
+          Rule: "ANY Writers"
+      Admins:
+          Type: ImplicitMeta
+          Rule: "MAJORITY Admins"
+      BlockValidation:
+          Type: ImplicitMeta
+          Rule: "ANY Writers"
+{% endif %}
+{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
   Capabilities:
     <<: *OrdererCapabilities
 {% endif %}
@@ -49,37 +100,59 @@ Application: &ApplicationDefaults
 {%   for org in peerorgs %}
     - *{{ org }}
 {%   endfor %}
+{% if project_version | version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %}
+  Policies:
+      Readers:
+          Type: ImplicitMeta
+          Rule: "ANY Readers"
+      Writers:
+          Type: ImplicitMeta
+          Rule: "ANY Writers"
+      Admins:
+          Type: ImplicitMeta
+          Rule: "MAJORITY Admins"
+{% endif %}
+
+{% if project_version | version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %}
+Channel: &ChannelDefaults
+    Policies:
+        Readers:
+            Type: ImplicitMeta
+            Rule: "ANY Readers"
+        Writers:
+            Type: ImplicitMeta
+            Rule: "ANY Writers"
+        Admins:
+            Type: ImplicitMeta
+            Rule: "MAJORITY Admins"
+{% endif %}
+{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
+    Capabilities:
+      <<: *ChannelCapabilities
+{% endif %}
 
 Profiles:
   OrgChannel:
     Consortium: FabricConsortium
     Application:
       <<: *ApplicationDefaults
-{% if project_version | version_compare('1.1.0','>=') %}
+{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
     Capabilities:
       <<: *ApplicationCapabilities
 {% endif %}
   OrdererGenesis:
-    Orderer:
-      <<: *OrdererDefaults
-{% if project_version | version_compare('1.1.0','>=') %}
+{% if project_version | version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %}
+    <<: *ChannelDefaults
+{% endif %}
+{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
     Capabilities:
       <<: *ChannelCapabilities
 {% endif %}
+    Orderer:
+      <<: *OrdererDefaults
     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 %}
diff --git a/src/agent/ansible/roles/deploy_compose/certsetup/templates/core.j2 b/src/agent/ansible/roles/deploy_compose/certsetup/templates/core.j2
@@ -1,7 +1,7 @@
 ---
 logging:
 {% set project_version = fabric.baseimage_tag %}
-{% if project_version | version_compare('1.1.0','>=') %}
+{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
     level:      info
 {% else %}
     peer:       info
@@ -12,23 +12,23 @@ logging:
     msp:        warning
     policies:   warning
     grpc:       error
-{% if project_version | version_compare('1.1.0','>=') %}
+{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
     peer:
         gossip: warning
 {% endif %}
 
     format: '%{color}%{time:2006-01-02 15:04:05.000 MST} [%{module}] %{shortfunc} -> %{level:.4s} %{id:03x}%{color:reset} %{message}'
 
 peer:
-{% if project_version | version_compare('1.1.0','>=') %}
+{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
     id: jdoe
     address: 0.0.0.0:7051
 {% endif %}
     networkId: dev
     listenAddress: 0.0.0.0:7051
     addressAutoDetect: false
     gomaxprocs: -1
-{% if project_version | version_compare('1.1.0','>=') %}
+{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
     keepalive:
         minInterval: 60s
         client:
@@ -57,13 +57,13 @@ peer:
         dialTimeout: 3s
         connTimeout: 2s
         recvBuffSize: 20
-{% if project_version | version_compare('1.1.0','>=') %}
+{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
         sendBuffSize: 200
 {% else %}
         sendBuffSize: 20
 {% endif %}
         digestWaitTime: 1s
-        requestWaitTime: 1s
+        requestWaitTime: 1500ms
         responseWaitTime: 2s
         aliveTimeInterval: 5s
         aliveExpirationTimeout: 25s
@@ -75,7 +75,7 @@ peer:
             leaderAliveThreshold: 10s
             leaderElectionDuration: 5s
 
-{% if project_version | version_compare('1.1.0','>=') %}
+{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
         pvtData:
             pullRetryThreshold: 60s
             transientstoreMaxBlockRetention: 1000
@@ -86,7 +86,7 @@ peer:
         address: 0.0.0.0:7053
         buffersize: 100
         timeout: 10ms
-{% if project_version | version_compare('1.1.0','>=') %}
+{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
         timewindow: 15m
         keepalive:
             minInterval: 60s
@@ -100,7 +100,7 @@ peer:
             file: tls/server.key
         rootcert:
             file: tls/ca.crt
-{% if project_version | version_compare('1.1.0','>=') %}
+{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
         clientAuthRequired: false
         clientRootCAs:
             files:
@@ -124,20 +124,32 @@ peer:
 
     mspConfigPath: msp
 
-{% if project_version | version_compare('1.1.0','>=') %}
+{% if project_version | version_compare('1.1.0','>=') and project_version | version_compare('1.2.0','<') %}
     localMspId: DEFAULT
+{% if project_version | version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %}
+    localMspId: {{ item.org }}
+    client:
+        connTimeout: 3s
+{% endif %}
 
     deliveryclient:
+{% if project_version | version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %}
+        connTimeout: 3s
+        reConnectBackoffThreshold: 3600s
+{% endif %}
         reconnectTotalTimeThreshold: 3600s
 
     localMspType: bccsp
 {% endif %}
-
+{% if project_version | version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %}
+    adminService:
+        #listenAddress: 0.0.0.0:7055
+{% endif %}
     profile:
         enabled:     false
         listenAddress: 0.0.0.0:6060
 
-{% if project_version | version_compare('1.1.0','>=') %}
+{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
     handlers:
         authFilters:
           -
@@ -147,7 +159,22 @@ peer:
         decorators:
           -
             name: DefaultDecorator
-
+{% if project_version | version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %}
+        endorsers:
+          escc:
+            name: DefaultEndorsement
+            library:
+        validators:
+          vscc:
+            name: DefaultValidation
+            library:
+    discovery:
+        enabled: true
+        authCacheEnabled: true
+        authCacheMaxSize: 1000
+        authCachePurgeRetentionRatio: 0.75
+        orgMembersAllowedAccess: false
+{% endif %}
     validatorPoolSize:
 {% endif %}
 
@@ -166,7 +193,7 @@ vm:
         attachStdout: false
 
         hostConfig:
-{% if project_version | version_compare('1.1.0','>=') %}
+{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
             NetworkMode: host
 {% else %}
             NetworkMode: bridge
@@ -188,13 +215,13 @@ chaincode:
         path:
         name:
 
-    builder: $(DOCKER_NS)/fabric-ccenv:$(ARCH)-$(PROJECT_VERSION)
-{% if project_version | version_compare('1.1.0','>=') %}
+    builder: {{ fabric.repo.url }}fabric-ccenv:{{ fabric.baseimage_tag }}
+{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
     pull: false
 {% endif %}
     golang:
         runtime: $(BASE_DOCKER_NS)/fabric-baseos:$(ARCH)-$(BASE_VERSION)
-{% if project_version | version_compare('1.1.0','>=') %}
+{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
         dynamicLink: false
     node:
         runtime: $(BASE_DOCKER_NS)/fabric-baseimage:$(ARCH)-$(BASE_VERSION)
@@ -216,7 +243,7 @@ chaincode:
         vscc: enable
         qscc: enable
 
-{% if project_version | version_compare('1.1.0','>=') %}
+{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
     systemPlugins:
 {% endif %}
     logging:
@@ -238,14 +265,14 @@ ledger:
        maxRetriesOnStartup: 10
        requestTimeout: 35s
        queryLimit: 10000
-{% if project_version | version_compare('1.1.0','>=') %}
+{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
        maxBatchUpdateSize: 1000
 {% endif %}
 
   history:
     enableHistoryDatabase: true
 
-{% if project_version | version_compare('1.1.0','>=') %}
+{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
 metrics:
         enabled: false
         reporter: statsd

diff --git a/src/agent/ansible/roles/deploy_compose/certsetup/templates/crypto-config.j2 b/src/agent/ansible/roles/deploy_compose/certsetup/templates/crypto-config.j2
@@ -1,4 +1,5 @@
 ---
+{% set project_version = fabric.baseimage_tag %}
 {% if orderers | length > 0 %}
 OrdererOrgs:
 {% for org in ordererorgs %}
@@ -19,6 +20,9 @@ PeerOrgs:
 {% for org in peerorgs %}
   - Name: {{ org }}
     Domain: {{ org }}
+{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %}
+    EnableNodeOUs: true
+{% endif %}
     Specs:
 {%   for item in peers %}
 {%     if item.org == org %}