From 33087f1549c17a4700eee6e3ea0d079a0b1c2c96 Mon Sep 17 00:00:00 2001 From: Tong Li Date: Thu, 12 Jul 2018 11:14:24 -0400 Subject: [PATCH] [CE-414]Remove deprecated methods in playbooks Change-Id: Idf3216687b9b114588875cc184877e4d4a60aded Signed-off-by: Tong Li --- src/agent/ansible/aws.yml | 6 +-- src/agent/ansible/awsk8s.yml | 6 +-- src/agent/ansible/azureyml | 6 +-- src/agent/ansible/initcluster.yml | 2 +- src/agent/ansible/os.yml | 6 +-- src/agent/ansible/osk8s.yml | 6 +-- src/agent/ansible/provcluster.yml | 2 +- src/agent/ansible/roles/cloud_aws/plays.yml | 8 ++-- .../cloud_aws/postprovision/tasks/apply.yml | 2 +- src/agent/ansible/roles/cloud_azure/plays.yml | 8 ++-- .../cloud_azure/postprovision/tasks/apply.yml | 2 +- src/agent/ansible/roles/cloud_os/plays.yml | 8 ++-- src/agent/ansible/roles/cloud_vb/plays.yml | 14 +++---- .../certsetup/templates/configtx.j2 | 24 +++++------ .../certsetup/templates/core.j2 | 42 +++++++++---------- .../certsetup/templates/crypto-config.j2 | 2 +- .../ansible/roles/deploy_compose/plays.yml | 6 +-- .../deploy_k8s/fabricsetup/tasks/apply.yml | 12 ++++++ .../fabricsetup/templates/dochannel.j2 | 4 +- .../fabricsetup/templates/fabric-pod.j2 | 2 +- src/agent/ansible/roles/deploy_k8s/plays.yml | 8 ++-- src/agent/ansible/roles/env_calico/plays.yml | 8 ++-- .../ansible/roles/env_flanneld/apply.yml | 12 +++--- .../ansible/roles/env_flanneld/destroy.yml | 10 ++--- src/agent/ansible/roles/env_k8s/apply.yml | 16 +++---- src/agent/ansible/roles/env_k8s/destroy.yml | 14 +++---- src/agent/ansible/setupfabric.yml | 2 +- src/agent/ansible/upgradecomposer.yml | 2 +- src/agent/ansible/vb.yml | 6 +-- src/agent/ansible/vbk8s.yml | 6 +-- src/agent/ansible/verify.yml | 2 +- 31 files changed, 133 insertions(+), 121 deletions(-) mode change 100644 => 100755 src/agent/ansible/azureyml diff --git a/src/agent/ansible/aws.yml b/src/agent/ansible/aws.yml index ade1a1585..647c09286 100755 --- a/src/agent/ansible/aws.yml +++ b/src/agent/ansible/aws.yml @@ -10,19 +10,19 @@ vars: env: "aws" cloud_type: "aws" - include: "roles/cloud_aws/plays.yml" + import_playbook: "roles/cloud_aws/plays.yml" - name: Run the plays vars: env: "aws" env_type: "flanneld" - include: "roles/env_flanneld/{{ mode }}.yml" + import_playbook: "roles/env_flanneld/{{ mode }}.yml" - name: Run the plays vars: env: "bc1st" deploy_type: "compose" - include: "roles/deploy_compose/plays.yml" + import_playbook: "roles/deploy_compose/plays.yml" - name: Inform the installer hosts: cloud diff --git a/src/agent/ansible/awsk8s.yml b/src/agent/ansible/awsk8s.yml index 6f82d5719..a03903ff0 100755 --- a/src/agent/ansible/awsk8s.yml +++ b/src/agent/ansible/awsk8s.yml @@ -10,19 +10,19 @@ vars: env: "aws" cloud_type: "aws" - include: "roles/cloud_aws/plays.yml" + import_playbook: "roles/cloud_aws/plays.yml" - name: Run the plays vars: env: "aws" env_type: "k8s" - include: "roles/env_k8s/{{ mode }}.yml" + import_playbook: "roles/env_k8s/{{ mode }}.yml" - name: Run the plays vars: env: "bc1st" deploy_type: "k8s" - include: "roles/deploy_k8s/plays.yml" + import_playbook: "roles/deploy_k8s/plays.yml" - name: Inform the installer hosts: cloud diff --git a/src/agent/ansible/azureyml b/src/agent/ansible/azureyml old mode 100644 new mode 100755 index cb5fabbc7..682613c28 --- a/src/agent/ansible/azureyml +++ b/src/agent/ansible/azureyml @@ -10,19 +10,19 @@ vars: env: "azure" cloud_type: "azure" - include: "roles/cloud_azure/plays.yml" + import_playbook: "roles/cloud_azure/plays.yml" - name: Run the plays vars: env: "azure" env_type: "k8s" - include: "roles/env_k8s/plays.yml" + import_playbook: "roles/env_k8s/plays.yml" - name: Run the plays vars: env: "bc1st" deploy_type: "k8s" - include: "roles/deploy_k8s/plays.yml" + import_playbook: "roles/deploy_k8s/plays.yml" - name: Inform the installer hosts: cloud diff --git a/src/agent/ansible/initcluster.yml b/src/agent/ansible/initcluster.yml index 402080304..6a75da859 100755 --- a/src/agent/ansible/initcluster.yml +++ b/src/agent/ansible/initcluster.yml @@ -7,7 +7,7 @@ starttime: "{{ ansible_date_time }}" - name: Run the plays - include: "roles/env_{{ env_type | default('flanneld') }}/{{ mode }}.yml" + import_playbook: "roles/env_{{ env_type | default('flanneld') }}/{{ mode }}.yml" - name: inform the installer hosts: cloud diff --git a/src/agent/ansible/os.yml b/src/agent/ansible/os.yml index 10ac6b31c..a78a2248c 100755 --- a/src/agent/ansible/os.yml +++ b/src/agent/ansible/os.yml @@ -10,19 +10,19 @@ vars: env: "os" cloud_type: "os" - include: "roles/cloud_os/plays.yml" + import_playbook: "roles/cloud_os/plays.yml" - name: Run the plays vars: env: "os" env_type: "flanneld" - include: "roles/env_flanneld/{{ mode }}.yml" + import_playbook: "roles/env_flanneld/{{ mode }}.yml" - name: Run the plays vars: env: "bc1st" deploy_type: "compose" - include: "roles/deploy_compose/plays.yml" + import_playbook: "roles/deploy_compose/plays.yml" - name: Inform the installer hosts: cloud diff --git a/src/agent/ansible/osk8s.yml b/src/agent/ansible/osk8s.yml index 107000050..389a466be 100755 --- a/src/agent/ansible/osk8s.yml +++ b/src/agent/ansible/osk8s.yml @@ -10,19 +10,19 @@ vars: env: "os" cloud_type: "os" - include: "roles/cloud_os/plays.yml" + import_playbook: "roles/cloud_os/plays.yml" - name: Run the plays vars: env: "os" env_type: "k8s" - include: "roles/env_k8s/{{ mode }}.yml" + import_playbook: "roles/env_k8s/{{ mode }}.yml" - name: Run the plays vars: env: "bc1st" deploy_type: "k8s" - include: "roles/deploy_k8s/plays.yml" + import_playbook: "roles/deploy_k8s/plays.yml" - name: Inform the installer hosts: cloud diff --git a/src/agent/ansible/provcluster.yml b/src/agent/ansible/provcluster.yml index dda07dd7d..bc6cbe97c 100755 --- a/src/agent/ansible/provcluster.yml +++ b/src/agent/ansible/provcluster.yml @@ -7,7 +7,7 @@ starttime: "{{ ansible_date_time }}" - name: Run the plays - include: "roles/cloud_{{ cloud_type | default('os') }}/plays.yml" + import_playbook: "roles/cloud_{{ cloud_type | default('os') }}/plays.yml" - name: Inform the installer hosts: cloud diff --git a/src/agent/ansible/roles/cloud_aws/plays.yml b/src/agent/ansible/roles/cloud_aws/plays.yml index 9c2ed682b..89f91dc23 100755 --- a/src/agent/ansible/roles/cloud_aws/plays.yml +++ b/src/agent/ansible/roles/cloud_aws/plays.yml @@ -5,7 +5,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "prepare/tasks/{{ mode }}.yml" + - include_tasks: "prepare/tasks/{{ mode }}.yml" tags: "prepare" - name: provision servers @@ -15,7 +15,7 @@ vars_files: - "{{ playbook_dir }}/../../vars/{{ env }}.yml" tasks: - - include: "provision/tasks/{{ mode }}.yml" + - include_tasks: "provision/tasks/{{ mode }}.yml" tags: "provision" - name: Post provision process @@ -24,7 +24,7 @@ vars_files: - "{{ playbook_dir }}/../../vars/{{ env }}.yml" tasks: - - include: "postprovision/tasks/{{ mode }}.yml" + - include_tasks: "postprovision/tasks/{{ mode }}.yml" tags: "postprovision" - name: change /etc/hosts files so that each node knows other nodes @@ -36,5 +36,5 @@ vars_files: - "{{ playbook_dir }}/../../vars/{{ env }}.yml" tasks: - - include: "../cloud_os/namenode/tasks/{{ mode }}.yml" + - include_tasks: "../cloud_os/namenode/tasks/{{ mode }}.yml" tags: "namenode" diff --git a/src/agent/ansible/roles/cloud_aws/postprovision/tasks/apply.yml b/src/agent/ansible/roles/cloud_aws/postprovision/tasks/apply.yml index f0aa529eb..a916571fb 100755 --- a/src/agent/ansible/roles/cloud_aws/postprovision/tasks/apply.yml +++ b/src/agent/ansible/roles/cloud_aws/postprovision/tasks/apply.yml @@ -1,2 +1,2 @@ --- -- include: ../../../cloud_os/postprovision/tasks/apply.yml \ No newline at end of file +- include_tasks: ../../../cloud_os/postprovision/tasks/apply.yml \ No newline at end of file diff --git a/src/agent/ansible/roles/cloud_azure/plays.yml b/src/agent/ansible/roles/cloud_azure/plays.yml index 9c2ed682b..89f91dc23 100755 --- a/src/agent/ansible/roles/cloud_azure/plays.yml +++ b/src/agent/ansible/roles/cloud_azure/plays.yml @@ -5,7 +5,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "prepare/tasks/{{ mode }}.yml" + - include_tasks: "prepare/tasks/{{ mode }}.yml" tags: "prepare" - name: provision servers @@ -15,7 +15,7 @@ vars_files: - "{{ playbook_dir }}/../../vars/{{ env }}.yml" tasks: - - include: "provision/tasks/{{ mode }}.yml" + - include_tasks: "provision/tasks/{{ mode }}.yml" tags: "provision" - name: Post provision process @@ -24,7 +24,7 @@ vars_files: - "{{ playbook_dir }}/../../vars/{{ env }}.yml" tasks: - - include: "postprovision/tasks/{{ mode }}.yml" + - include_tasks: "postprovision/tasks/{{ mode }}.yml" tags: "postprovision" - name: change /etc/hosts files so that each node knows other nodes @@ -36,5 +36,5 @@ vars_files: - "{{ playbook_dir }}/../../vars/{{ env }}.yml" tasks: - - include: "../cloud_os/namenode/tasks/{{ mode }}.yml" + - include_tasks: "../cloud_os/namenode/tasks/{{ mode }}.yml" tags: "namenode" diff --git a/src/agent/ansible/roles/cloud_azure/postprovision/tasks/apply.yml b/src/agent/ansible/roles/cloud_azure/postprovision/tasks/apply.yml index f0aa529eb..a916571fb 100755 --- a/src/agent/ansible/roles/cloud_azure/postprovision/tasks/apply.yml +++ b/src/agent/ansible/roles/cloud_azure/postprovision/tasks/apply.yml @@ -1,2 +1,2 @@ --- -- include: ../../../cloud_os/postprovision/tasks/apply.yml \ No newline at end of file +- include_tasks: ../../../cloud_os/postprovision/tasks/apply.yml \ No newline at end of file diff --git a/src/agent/ansible/roles/cloud_os/plays.yml b/src/agent/ansible/roles/cloud_os/plays.yml index 7cd27d21a..347b5ea68 100755 --- a/src/agent/ansible/roles/cloud_os/plays.yml +++ b/src/agent/ansible/roles/cloud_os/plays.yml @@ -5,7 +5,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "prepare/tasks/{{ mode }}.yml" + - include_tasks: "prepare/tasks/{{ mode }}.yml" tags: "prepare" - name: provision servers @@ -15,7 +15,7 @@ vars_files: - "{{ playbook_dir }}/../../vars/{{ env }}.yml" tasks: - - include: "provision/tasks/{{ mode }}.yml" + - include_tasks: "provision/tasks/{{ mode }}.yml" tags: "provision" - name: Post provision process @@ -24,7 +24,7 @@ vars_files: - "{{ playbook_dir }}/../../vars/{{ env }}.yml" tasks: - - include: "postprovision/tasks/{{ mode }}.yml" + - include_tasks: "postprovision/tasks/{{ mode }}.yml" tags: "postprovision" - name: change /etc/hosts files so that each node knows other nodes @@ -36,5 +36,5 @@ vars_files: - "{{ playbook_dir }}/../../vars/{{ env }}.yml" tasks: - - include: "namenode/tasks/{{ mode }}.yml" + - include_tasks: "namenode/tasks/{{ mode }}.yml" tags: "namenode" diff --git a/src/agent/ansible/roles/cloud_vb/plays.yml b/src/agent/ansible/roles/cloud_vb/plays.yml index 835c91577..904af84cb 100755 --- a/src/agent/ansible/roles/cloud_vb/plays.yml +++ b/src/agent/ansible/roles/cloud_vb/plays.yml @@ -5,7 +5,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "prepare/tasks/main.yml" + - include_tasks: "prepare/tasks/main.yml" tags: "prepare" - name: provision servers @@ -14,7 +14,7 @@ vars_files: - "{{ playbook_dir }}/../../vars/{{ env }}.yml" tasks: - - include: "provision/tasks/{{ mode }}.yml" + - include_tasks: "provision/tasks/{{ mode }}.yml" tags: "provision" - name: Generate runhost file @@ -23,7 +23,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "wait/tasks/{{ mode }}.yml" + - include_tasks: "wait/tasks/{{ mode }}.yml" tags: "wait" - name: Get VM IP addresses @@ -33,7 +33,7 @@ vars_files: - "{{ playbook_dir }}/../../vars/{{ env }}.yml" tasks: - - include: "netprocess/tasks/{{ mode }}.yml" + - include_tasks: "netprocess/tasks/{{ mode }}.yml" tags: "netprocess" - name: Generate runhost file @@ -42,7 +42,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "post/tasks/{{ mode }}.yml" + - include_tasks: "post/tasks/{{ mode }}.yml" tags: "post" - name: Setup hostname and static node names @@ -54,7 +54,7 @@ vars_files: - "{{ playbook_dir }}/../../vars/{{ env }}.yml" tasks: - - include: "namenode/tasks/{{ mode }}.yml" + - include_tasks: "namenode/tasks/{{ mode }}.yml" tags: "namenode" - name: Setup certificates for ssh access @@ -64,5 +64,5 @@ vars_files: - "{{ playbook_dir }}/../../vars/{{ env }}.yml" tasks: - - include: "addcert/tasks/{{ mode }}.yml" + - include_tasks: "addcert/tasks/{{ mode }}.yml" tags: "addcert" 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 436ddacc3..1cc6eded3 100755 --- a/src/agent/ansible/roles/deploy_compose/certsetup/templates/configtx.j2 +++ b/src/agent/ansible/roles/deploy_compose/certsetup/templates/configtx.j2 @@ -13,7 +13,7 @@ Organizations: ID: {{ org }} MSPDir: {{ fabricworkdir }}/keyfiles/{{ org }}/msp {% if org in peerorgs %} -{% if project_version | version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %} Policies: Readers: Type: Signature @@ -31,7 +31,7 @@ Organizations: Port: 7051 {% endif %} {% elif org in ordererorgs %} -{% if project_version | version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %} Policies: Readers: Type: Signature @@ -48,7 +48,7 @@ Organizations: {% endfor %} {% endif %} -{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} Capabilities: Global: &ChannelCapabilities V1_1: true @@ -57,9 +57,9 @@ Capabilities: V1_1: true Application: &ApplicationCapabilities -{% if project_version | version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %} V1_2: true -{% elif project_version | version_compare('1.1.0','>=') and project_version | version_compare('1.2.0','<') %} +{% elif project_version is version_compare('1.1.0','>=') and project_version is version_compare('1.2.0','<') %} V1_1: true {% endif %} {% endif %} @@ -86,7 +86,7 @@ Orderer: &OrdererDefaults {% for org in ordererorgs %} - *{{ org }} {% endfor %} -{% if project_version | version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %} Policies: Readers: Type: ImplicitMeta @@ -101,7 +101,7 @@ Orderer: &OrdererDefaults Type: ImplicitMeta Rule: "ANY Writers" {% endif %} -{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} Capabilities: <<: *OrdererCapabilities {% endif %} @@ -111,7 +111,7 @@ 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' %} +{% if project_version is version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %} Policies: Readers: Type: ImplicitMeta @@ -124,7 +124,7 @@ Application: &ApplicationDefaults Rule: "MAJORITY Admins" {% endif %} -{% if project_version | version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %} Channel: &ChannelDefaults Policies: Readers: @@ -143,15 +143,15 @@ Profiles: Consortium: FabricConsortium Application: <<: *ApplicationDefaults -{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% 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 | version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is 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' %} +{% if project_version is version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} Capabilities: <<: *ChannelCapabilities {% 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 index 15b8d7b77..0d390237d 100755 --- a/src/agent/ansible/roles/deploy_compose/certsetup/templates/core.j2 +++ b/src/agent/ansible/roles/deploy_compose/certsetup/templates/core.j2 @@ -6,7 +6,7 @@ logging: {% set tag = fabric.baseimage_tag.split('-') %} {% set project_version = tag[1] %} {% endif %} -{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} level: info {% else %} peer: info @@ -17,7 +17,7 @@ logging: msp: warning policies: warning grpc: error -{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} peer: gossip: warning {% endif %} @@ -25,7 +25,7 @@ logging: 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','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} id: jdoe address: 0.0.0.0:7051 {% endif %} @@ -33,7 +33,7 @@ peer: listenAddress: 0.0.0.0:7051 addressAutoDetect: false gomaxprocs: -1 -{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} keepalive: minInterval: 60s client: @@ -62,7 +62,7 @@ peer: dialTimeout: 3s connTimeout: 2s recvBuffSize: 20 -{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} sendBuffSize: 200 {% else %} sendBuffSize: 20 @@ -80,7 +80,7 @@ peer: leaderAliveThreshold: 10s leaderElectionDuration: 5s -{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} pvtData: pullRetryThreshold: 60s transientstoreMaxBlockRetention: 1000 @@ -91,7 +91,7 @@ peer: address: 0.0.0.0:7053 buffersize: 100 timeout: 10ms -{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} timewindow: 15m keepalive: minInterval: 60s @@ -105,7 +105,7 @@ peer: file: tls/server.key rootcert: file: tls/ca.crt -{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} clientAuthRequired: false clientRootCAs: files: @@ -129,16 +129,16 @@ peer: mspConfigPath: msp -{% if project_version | version_compare('1.1.0','>=') and project_version | version_compare('1.2.0','<') %} +{% if project_version is version_compare('1.1.0','>=') and project_version is version_compare('1.2.0','<') %} localMspId: DEFAULT -{% if project_version | version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is 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' %} +{% if project_version is version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %} connTimeout: 3s reConnectBackoffThreshold: 3600s {% endif %} @@ -146,7 +146,7 @@ peer: localMspType: bccsp {% endif %} -{% if project_version | version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %} adminService: #listenAddress: 0.0.0.0:7055 {% endif %} @@ -154,7 +154,7 @@ peer: enabled: false listenAddress: 0.0.0.0:6060 -{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} handlers: authFilters: - @@ -164,7 +164,7 @@ peer: decorators: - name: DefaultDecorator -{% if project_version | version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %} endorsers: escc: name: DefaultEndorsement @@ -198,7 +198,7 @@ vm: attachStdout: false hostConfig: -{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} NetworkMode: host {% else %} NetworkMode: bridge @@ -212,7 +212,7 @@ vm: Memory: 2147483648 chaincode: -{% if project_version | version_compare('1.1.0','<') %} +{% if project_version is version_compare('1.1.0','<') %} peerAddress: {% endif %} @@ -221,12 +221,12 @@ chaincode: name: 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' %} +{% if project_version is 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','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is 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) @@ -248,7 +248,7 @@ chaincode: vscc: enable qscc: enable -{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} systemPlugins: {% endif %} logging: @@ -270,14 +270,14 @@ ledger: maxRetriesOnStartup: 10 requestTimeout: 35s queryLimit: 10000 -{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is 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','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is 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 index 5922aee87..7fc402e64 100755 --- a/src/agent/ansible/roles/deploy_compose/certsetup/templates/crypto-config.j2 +++ b/src/agent/ansible/roles/deploy_compose/certsetup/templates/crypto-config.j2 @@ -25,7 +25,7 @@ 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' %} +{% if project_version is version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} EnableNodeOUs: true {% endif %} Specs: diff --git a/src/agent/ansible/roles/deploy_compose/plays.yml b/src/agent/ansible/roles/deploy_compose/plays.yml index cff622e05..07b4d87fb 100755 --- a/src/agent/ansible/roles/deploy_compose/plays.yml +++ b/src/agent/ansible/roles/deploy_compose/plays.yml @@ -16,7 +16,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "certsetup/tasks/{{ mode }}.yml" + - include_tasks: "certsetup/tasks/{{ mode }}.yml" tags: "certsetup" - name: setup fabric network @@ -26,7 +26,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "fabricsetup/tasks/{{ mode }}.yml" + - include_tasks: "fabricsetup/tasks/{{ mode }}.yml" tags: "fabricsetup" - name: setup composer @@ -36,5 +36,5 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "composersetup/tasks/{{ mode }}.yml" + - include_tasks: "composersetup/tasks/{{ mode }}.yml" tags: "composersetup" diff --git a/src/agent/ansible/roles/deploy_k8s/fabricsetup/tasks/apply.yml b/src/agent/ansible/roles/deploy_k8s/fabricsetup/tasks/apply.yml index 305313219..ceffdf7a1 100755 --- a/src/agent/ansible/roles/deploy_k8s/fabricsetup/tasks/apply.yml +++ b/src/agent/ansible/roles/deploy_k8s/fabricsetup/tasks/apply.yml @@ -194,3 +194,15 @@ chdir: "{{ playbook_dir }}/../../vars/" tags: "channeloperation" when: (allorderers | length > 0) and (allpeers | length > 0) + +- name: Wait for channel operation pod to complete + command: >- + ./kubectl --kubeconfig kubeconfig -o=custom-columns=STATUS:.status.phase + get pods -l k8s-app=fabriccli --no-headers --field-selector=status.phase=Succeeded + args: + chdir: "{{ playbook_dir }}/../../vars/" + register: podstatus + until: podstatus.stdout_lines | length == 1 + when: (allorderers | length > 0) and (allpeers | length > 0) + retries: 50 + delay: 5 diff --git a/src/agent/ansible/roles/deploy_k8s/fabricsetup/templates/dochannel.j2 b/src/agent/ansible/roles/deploy_k8s/fabricsetup/templates/dochannel.j2 index e8554e614..7b3e2e4c6 100755 --- a/src/agent/ansible/roles/deploy_k8s/fabricsetup/templates/dochannel.j2 +++ b/src/agent/ansible/roles/deploy_k8s/fabricsetup/templates/dochannel.j2 @@ -19,7 +19,7 @@ export CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/allorgs/keyfiles/{{ clipeer.org # Run the peer channel create command cd /etc/hyperledger/allorgs/keyfiles -{% if project_version | version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %} TIMEOUT=240s {% else %} TIMEOUT=240 @@ -83,7 +83,7 @@ export CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/allorgs/keyfiles/{{ clipeer.org # Run the peer channel create command cd /etc/hyperledger/allorgs/keyfiles -{% if project_version | version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is version_compare('1.2.0','>=') or 'stable' in project_version or project_version == 'latest' %} TIMEOUT=240s {% else %} TIMEOUT=240 diff --git a/src/agent/ansible/roles/deploy_k8s/fabricsetup/templates/fabric-pod.j2 b/src/agent/ansible/roles/deploy_k8s/fabricsetup/templates/fabric-pod.j2 index 9d5d7debf..23b349109 100755 --- a/src/agent/ansible/roles/deploy_k8s/fabricsetup/templates/fabric-pod.j2 +++ b/src/agent/ansible/roles/deploy_k8s/fabricsetup/templates/fabric-pod.j2 @@ -281,7 +281,7 @@ spec: - { name: "CORE_PEER_GOSSIP_EXTERNALENDPOINT", value: "{{ peer.name }}:7051" } - { name: "CORE_PEER_ADDRESS", value: "{{ peer.name }}:7051" } - { name: "CORE_PEER_LISTENADDRESS", value: "{{ peer.name }}:7051" } -{% if project_version | version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} +{% if project_version is version_compare('1.1.0','>=') or 'stable' in project_version or project_version == 'latest' %} - { name: "CORE_PEER_CHAINCODEADDRESS", value: "{{ peer.name }}:7052" } - { name: "CORE_PEER_CHAINCODELISTENADDRESS", value: "0.0.0.0:7052" } {% else %} diff --git a/src/agent/ansible/roles/deploy_k8s/plays.yml b/src/agent/ansible/roles/deploy_k8s/plays.yml index efaff1aab..7445fa5d2 100755 --- a/src/agent/ansible/roles/deploy_k8s/plays.yml +++ b/src/agent/ansible/roles/deploy_k8s/plays.yml @@ -7,7 +7,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "getbin/tasks/{{ mode }}.yml" + - include_tasks: "getbin/tasks/{{ mode }}.yml" tags: "getbin" - name: generate certificates @@ -18,7 +18,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "../deploy_compose/certsetup/tasks/{{ mode }}.yml" + - include_tasks: "../deploy_compose/certsetup/tasks/{{ mode }}.yml" tags: "certsetup" - name: setup fabric network @@ -29,7 +29,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "fabricsetup/tasks/{{ mode }}.yml" + - include_tasks: "fabricsetup/tasks/{{ mode }}.yml" tags: "fabricsetup" - name: setup composer @@ -40,5 +40,5 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "composersetup/tasks/{{ mode }}.yml" + - include_tasks: "composersetup/tasks/{{ mode }}.yml" tags: "composersetup" diff --git a/src/agent/ansible/roles/env_calico/plays.yml b/src/agent/ansible/roles/env_calico/plays.yml index 012ec7616..60c8a8427 100755 --- a/src/agent/ansible/roles/env_calico/plays.yml +++ b/src/agent/ansible/roles/env_calico/plays.yml @@ -9,7 +9,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "../env_flanneld/fastinitnode/tasks/{{ mode }}.yml" + - include_tasks: "../env_flanneld/fastinitnode/tasks/{{ mode }}.yml" tags: "fastinitnode" - name: Setting up etcd services @@ -20,7 +20,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "../env_flanneld/etcdsetup/tasks/{{ mode }}.yml" + - include_tasks: "../env_flanneld/etcdsetup/tasks/{{ mode }}.yml" tags: "etcdsetup" - name: setup flanned on all nodes @@ -31,7 +31,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "networksetup/tasks/{{ mode }}.yml" + - include_tasks: "networksetup/tasks/{{ mode }}.yml" tags: "networksetup" - name: setup dns services @@ -42,5 +42,5 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "../env_flanneld/dnssetup/tasks/{{ mode }}.yml" + - include_tasks: "../env_flanneld/dnssetup/tasks/{{ mode }}.yml" tags: "dnssetup" diff --git a/src/agent/ansible/roles/env_flanneld/apply.yml b/src/agent/ansible/roles/env_flanneld/apply.yml index fd1e07079..44a7e6dd2 100755 --- a/src/agent/ansible/roles/env_flanneld/apply.yml +++ b/src/agent/ansible/roles/env_flanneld/apply.yml @@ -9,7 +9,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "fastinitnode/tasks/{{ mode }}.yml" + - include_tasks: "fastinitnode/tasks/{{ mode }}.yml" tags: "fastinitnode" - name: Setting up etcd services @@ -20,7 +20,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "etcdsetup/tasks/{{ mode }}.yml" + - include_tasks: "etcdsetup/tasks/{{ mode }}.yml" tags: "etcdsetup" - name: setup flanned on all nodes @@ -31,7 +31,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "networksetup/tasks/{{ mode }}.yml" + - include_tasks: "networksetup/tasks/{{ mode }}.yml" tags: "networksetup" - name: setup dns attribute for docker service @@ -42,7 +42,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "dnsdocker/tasks/{{ mode }}.yml" + - include_tasks: "dnsdocker/tasks/{{ mode }}.yml" tags: "dnsdocker" - name: setup dns services and registrator @@ -53,7 +53,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "dnssetup/tasks/{{ mode }}.yml" + - include_tasks: "dnssetup/tasks/{{ mode }}.yml" tags: "dnssetup" - name: Reset connections @@ -62,5 +62,5 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "resetconn/tasks/{{ mode }}.yml" + - include_tasks: "resetconn/tasks/{{ mode }}.yml" tags: "resetconn" diff --git a/src/agent/ansible/roles/env_flanneld/destroy.yml b/src/agent/ansible/roles/env_flanneld/destroy.yml index 2251c768f..ad8aab11e 100755 --- a/src/agent/ansible/roles/env_flanneld/destroy.yml +++ b/src/agent/ansible/roles/env_flanneld/destroy.yml @@ -7,7 +7,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "dnssetup/tasks/{{ mode }}.yml" + - include_tasks: "dnssetup/tasks/{{ mode }}.yml" tags: "dnssetup" - name: setup dns attribute for docker service @@ -18,7 +18,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "dnsdocker/tasks/{{ mode }}.yml" + - include_tasks: "dnsdocker/tasks/{{ mode }}.yml" tags: "dnsdocker" - name: setup flanned on all nodes @@ -29,7 +29,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "networksetup/tasks/{{ mode }}.yml" + - include_tasks: "networksetup/tasks/{{ mode }}.yml" tags: "networksetup" - name: Setting up etcd services @@ -40,7 +40,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "etcdsetup/tasks/{{ mode }}.yml" + - include_tasks: "etcdsetup/tasks/{{ mode }}.yml" tags: "etcdsetup" - name: fast initialize all the servers @@ -53,5 +53,5 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "fastinitnode/tasks/{{ mode }}.yml" + - include_tasks: "fastinitnode/tasks/{{ mode }}.yml" tags: "fastinitnode" diff --git a/src/agent/ansible/roles/env_k8s/apply.yml b/src/agent/ansible/roles/env_k8s/apply.yml index b8f472471..784c33c04 100755 --- a/src/agent/ansible/roles/env_k8s/apply.yml +++ b/src/agent/ansible/roles/env_k8s/apply.yml @@ -9,7 +9,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "../env_flanneld/fastinitnode/tasks/{{ mode }}.yml" + - include_tasks: "../env_flanneld/fastinitnode/tasks/{{ mode }}.yml" tags: "fastinitnode" - name: Setting up etcd services @@ -20,7 +20,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "../env_flanneld/etcdsetup/tasks/{{ mode }}.yml" + - include_tasks: "../env_flanneld/etcdsetup/tasks/{{ mode }}.yml" tags: "etcdsetup" - name: setup flanned on all nodes @@ -31,7 +31,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "../env_flanneld/networksetup/tasks/{{ mode }}.yml" + - include_tasks: "../env_flanneld/networksetup/tasks/{{ mode }}.yml" tags: "networksetup" - name: setup dns attribute for docker service @@ -42,7 +42,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "../env_flanneld/dnsdocker/tasks/{{ mode }}.yml" + - include_tasks: "../env_flanneld/dnsdocker/tasks/{{ mode }}.yml" tags: "dnsdocker" - name: setup k8s master node @@ -53,7 +53,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "master/tasks/{{ mode }}.yml" + - include_tasks: "master/tasks/{{ mode }}.yml" tags: "master" - name: setup k8s worker nodes @@ -64,7 +64,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "worker/tasks/{{ mode }}.yml" + - include_tasks: "worker/tasks/{{ mode }}.yml" tags: "worker" - name: setup k8s dashboard and dns services @@ -75,7 +75,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "post/tasks/{{ mode }}.yml" + - include_tasks: "post/tasks/{{ mode }}.yml" tags: "dashboard" - name: Reset connections @@ -84,5 +84,5 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "../env_flanneld/resetconn/tasks/{{ mode }}.yml" + - include_tasks: "../env_flanneld/resetconn/tasks/{{ mode }}.yml" tags: "resetconn" diff --git a/src/agent/ansible/roles/env_k8s/destroy.yml b/src/agent/ansible/roles/env_k8s/destroy.yml index 3c06a62d2..1bb65b157 100755 --- a/src/agent/ansible/roles/env_k8s/destroy.yml +++ b/src/agent/ansible/roles/env_k8s/destroy.yml @@ -7,7 +7,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "post/tasks/{{ mode }}.yml" + - include_tasks: "post/tasks/{{ mode }}.yml" tags: "dashboard" - name: setup k8s worker nodes @@ -18,7 +18,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "worker/tasks/{{ mode }}.yml" + - include_tasks: "worker/tasks/{{ mode }}.yml" tags: "worker" - name: setup k8s master node @@ -29,7 +29,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "master/tasks/{{ mode }}.yml" + - include_tasks: "master/tasks/{{ mode }}.yml" tags: "master" - name: setup dns attribute for docker service @@ -40,7 +40,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "../env_flanneld/dnsdocker/tasks/{{ mode }}.yml" + - include_tasks: "../env_flanneld/dnsdocker/tasks/{{ mode }}.yml" tags: "dnsdocker" - name: setup flanned on all nodes @@ -51,7 +51,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "../env_flanneld/networksetup/tasks/{{ mode }}.yml" + - include_tasks: "../env_flanneld/networksetup/tasks/{{ mode }}.yml" tags: "networksetup" - name: Setting up etcd services @@ -62,7 +62,7 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "../env_flanneld/etcdsetup/tasks/{{ mode }}.yml" + - include_tasks: "../env_flanneld/etcdsetup/tasks/{{ mode }}.yml" tags: "etcdsetup" - name: fast initialize all the servers @@ -75,5 +75,5 @@ vars_files: - "./../../vars/{{ env }}.yml" tasks: - - include: "../env_flanneld/fastinitnode/tasks/{{ mode }}.yml" + - include_tasks: "../env_flanneld/fastinitnode/tasks/{{ mode }}.yml" tags: "fastinitnode" diff --git a/src/agent/ansible/setupfabric.yml b/src/agent/ansible/setupfabric.yml index 02b9703d9..a0d624041 100755 --- a/src/agent/ansible/setupfabric.yml +++ b/src/agent/ansible/setupfabric.yml @@ -7,7 +7,7 @@ starttime: "{{ ansible_date_time }}" - name: Run the plays - include: "roles/deploy_{{ deploy_type | default('compose') }}/plays.yml" + import_playbook: "roles/deploy_{{ deploy_type | default('compose') }}/plays.yml" - name: inform the installer hosts: cloud diff --git a/src/agent/ansible/upgradecomposer.yml b/src/agent/ansible/upgradecomposer.yml index 364f091ce..81575a4f4 100755 --- a/src/agent/ansible/upgradecomposer.yml +++ b/src/agent/ansible/upgradecomposer.yml @@ -7,7 +7,7 @@ starttime: "{{ ansible_date_time }}" - name: Run the plays - include: "roles/upgrade_compose/plays.yml" + import_playbook: "roles/upgrade_compose/plays.yml" - name: inform the installer hosts: cloud diff --git a/src/agent/ansible/vb.yml b/src/agent/ansible/vb.yml index 50582f8e7..33d5ff00a 100755 --- a/src/agent/ansible/vb.yml +++ b/src/agent/ansible/vb.yml @@ -10,19 +10,19 @@ vars: env: "vb" cloud_type: "vb" - include: "roles/cloud_vb/plays.yml" + import_playbook: "roles/cloud_vb/plays.yml" - name: Run the plays vars: env: "vb" env_type: "flanneld" - include: "roles/env_flanneld/{{ mode}}.yml" + import_playbook: "roles/env_flanneld/{{ mode}}.yml" - name: Run the plays vars: env: "vb1st" deploy_type: "compose" - include: "roles/deploy_compose/plays.yml" + import_playbook: "roles/deploy_compose/plays.yml" - name: Inform the installer hosts: cloud diff --git a/src/agent/ansible/vbk8s.yml b/src/agent/ansible/vbk8s.yml index fea488084..1d29d5d00 100755 --- a/src/agent/ansible/vbk8s.yml +++ b/src/agent/ansible/vbk8s.yml @@ -10,19 +10,19 @@ vars: env: "vb" cloud_type: "vb" - include: "roles/cloud_vb/plays.yml" + import_playbook: "roles/cloud_vb/plays.yml" - name: Run the plays vars: env: "vb" env_type: "k8s" - include: "roles/env_k8s/{{ mode }}.yml" + import_playbook: "roles/env_k8s/{{ mode }}.yml" - name: Run the plays vars: env: "vb1st" deploy_type: "k8s" - include: "roles/deploy_k8s/plays.yml" + import_playbook: "roles/deploy_k8s/plays.yml" - name: Inform the installer hosts: cloud diff --git a/src/agent/ansible/verify.yml b/src/agent/ansible/verify.yml index a0aa75380..65e053c58 100755 --- a/src/agent/ansible/verify.yml +++ b/src/agent/ansible/verify.yml @@ -7,7 +7,7 @@ starttime: "{{ ansible_date_time }}" - name: Run the plays - include: "roles/verify/main.yml" + import_playbook: "roles/verify/main.yml" - name: inform the installer hosts: cloud