11 files changed, 23 insertions, 23 deletions
diff --git a/playbooks/common/openshift-cluster/redeploy-certificates/etcd-ca.yml b/playbooks/common/openshift-cluster/redeploy-certificates/etcd-ca.yml
index d4e922ca9..8dc8c4afb 100644
--- a/playbooks/common/openshift-cluster/redeploy-certificates/etcd-ca.yml
+++ b/playbooks/common/openshift-cluster/redeploy-certificates/etcd-ca.yml
@@ -39,7 +39,7 @@
   tasks:
   - include_role:
       name: etcd
-      tasks_from: distribute_ca
+      tasks_from: distribute_ca.yml
     vars:
       etcd_sync_cert_dir: "{{ hostvars['localhost'].g_etcd_mktemp.stdout }}"
       etcd_ca_host: "{{ groups.oo_etcd_to_config.0 }}"
diff --git a/playbooks/openshift-etcd/certificates.yml b/playbooks/openshift-etcd/certificates.yml
index 8240d3fe6..c06e3b575 100644
--- a/playbooks/openshift-etcd/certificates.yml
+++ b/playbooks/openshift-etcd/certificates.yml
@@ -1,6 +1,6 @@
 ---
-- include: ../init/main.yml
+- import_playbook: ../init/main.yml
 
-- include: private/ca.yml
+- import_playbook: private/ca.yml
 
-- include: private/certificates.yml
+- import_playbook: private/certificates.yml
diff --git a/playbooks/openshift-etcd/config.yml b/playbooks/openshift-etcd/config.yml
index 8ee57ce8d..c7814207c 100644
--- a/playbooks/openshift-etcd/config.yml
+++ b/playbooks/openshift-etcd/config.yml
@@ -1,4 +1,4 @@
 ---
-- include: ../init/main.yml
+- import_playbook: ../init/main.yml
 
-- include: private/config.yml
+- import_playbook: private/config.yml
diff --git a/playbooks/openshift-etcd/embedded2external.yml b/playbooks/openshift-etcd/embedded2external.yml
index a11b140de..7d090fa9b 100644
--- a/playbooks/openshift-etcd/embedded2external.yml
+++ b/playbooks/openshift-etcd/embedded2external.yml
@@ -1,4 +1,4 @@
 ---
-- include: ../init/main.yml
+- import_playbook: ../init/main.yml
 
-- include: private/embedded2external.yml
+- import_playbook: private/embedded2external.yml
diff --git a/playbooks/openshift-etcd/migrate.yml b/playbooks/openshift-etcd/migrate.yml
index a307c2740..0340b74a5 100644
--- a/playbooks/openshift-etcd/migrate.yml
+++ b/playbooks/openshift-etcd/migrate.yml
@@ -1,4 +1,4 @@
 ---
-- include: ../init/main.yml
+- import_playbook: ../init/main.yml
 
-- include: private/migrate.yml
+- import_playbook: private/migrate.yml
diff --git a/playbooks/openshift-etcd/private/certificates.yml b/playbooks/openshift-etcd/private/certificates.yml
index eb6b94f33..7c45938c1 100644
--- a/playbooks/openshift-etcd/private/certificates.yml
+++ b/playbooks/openshift-etcd/private/certificates.yml
@@ -1,4 +1,4 @@
 ---
-- include: server_certificates.yml
+- import_playbook: server_certificates.yml
 
-- include: master_etcd_certificates.yml
+- import_playbook: master_etcd_certificates.yml
diff --git a/playbooks/openshift-etcd/private/config.yml b/playbooks/openshift-etcd/private/config.yml
index 2e202e5a1..f49a3ecaa 100644
--- a/playbooks/openshift-etcd/private/config.yml
+++ b/playbooks/openshift-etcd/private/config.yml
@@ -11,9 +11,9 @@
           status: "In Progress"
           start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
-- include: ca.yml
+- import_playbook: ca.yml
 
-- include: certificates.yml
+- import_playbook: certificates.yml
 
 - name: Configure etcd
   hosts: oo_etcd_to_config
diff --git a/playbooks/openshift-etcd/private/embedded2external.yml b/playbooks/openshift-etcd/private/embedded2external.yml
index 410b0cae2..514319b88 100644
--- a/playbooks/openshift-etcd/private/embedded2external.yml
+++ b/playbooks/openshift-etcd/private/embedded2external.yml
@@ -49,9 +49,9 @@
       r_etcd_common_backup_sufix_name: "{{ embedded_etcd_backup_suffix }}"
 
 # 3. deploy certificates (for etcd and master)
-- include: ca.yml
+- import_playbook: ca.yml
 
-- include: server_certificates.yml
+- import_playbook: server_certificates.yml
 
 - name: Backup etcd client certificates for master host
   hosts: oo_first_master
@@ -61,12 +61,12 @@
       tasks_from: backup_master_etcd_certificates
 
 - name: Redeploy master etcd certificates
-  include: master_etcd_certificates.yml
+  import_playbook: master_etcd_certificates.yml
   vars:
     etcd_certificates_redeploy: "{{ true }}"
 
 # 4. deploy external etcd
-- include: config.yml
+- import_playbook: config.yml
 
 # 5. stop external etcd
 - name: Cleanse etcd
diff --git a/playbooks/openshift-etcd/private/migrate.yml b/playbooks/openshift-etcd/private/migrate.yml
index 2dac626bc..4269918c2 100644
--- a/playbooks/openshift-etcd/private/migrate.yml
+++ b/playbooks/openshift-etcd/private/migrate.yml
@@ -114,7 +114,7 @@
     set_fact:
       r_etcd_migrate_success: true
 
-- include: ./scaleup.yml
+- import_playbook: scaleup.yml
 
 - name: Gate on etcd migration
   hosts: oo_masters_to_config
diff --git a/playbooks/openshift-etcd/restart.yml b/playbooks/openshift-etcd/restart.yml
index 5e28e274e..041c1384d 100644
--- a/playbooks/openshift-etcd/restart.yml
+++ b/playbooks/openshift-etcd/restart.yml
@@ -1,4 +1,4 @@
 ---
-- include: ../init/main.yml
+- import_playbook: ../init/main.yml
 
-- include: private/restart.yml
+- import_playbook: private/restart.yml
diff --git a/playbooks/openshift-etcd/scaleup.yml b/playbooks/openshift-etcd/scaleup.yml
index d83697131..7e9ab6834 100644
--- a/playbooks/openshift-etcd/scaleup.yml
+++ b/playbooks/openshift-etcd/scaleup.yml
@@ -1,4 +1,4 @@
 ---
-- include: ../init/main.yml
+- import_playbook: ../init/main.yml
 
-- include: private/scaleup.yml
+- import_playbook: private/scaleup.yml