[CE-414]Remove deprecated methods in playbooks

Change-Id: Idf3216687b9b114588875cc184877e4d4a60aded Signed-off-by: Tong Li <litong01@us.ibm.com>
hyperledger · Jul 12, 2018 · 33087f1 · 33087f1
1 parent d9e4e28
commit 33087f1
Show file tree

Hide file tree

Showing 31 changed files with 133 additions and 121 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,2 +1,2 @@
 ---
-- include: ../../../cloud_os/postprovision/tasks/apply.yml
+- include_tasks: ../../../cloud_os/postprovision/tasks/apply.yml
diff --git 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
@@ -1,2 +1,2 @@
 ---
-- include: ../../../cloud_os/postprovision/tasks/apply.yml
+- include_tasks: ../../../cloud_os/postprovision/tasks/apply.yml
diff --git 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
@@ -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"