diff options
author | Russell Teague <rteague@redhat.com> | 2017-11-22 13:26:55 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-22 13:26:55 -0500 |
commit | 71e090a7a301ffd5ccef6bb78a28bfae96130ce6 (patch) | |
tree | 8bf7b5a9c95b3c7b3613b563a25dad45dbebfd83 /playbooks/openshift-etcd/private | |
parent | 84703c7100e3abef586a77899512f8c494f3f101 (diff) | |
parent | ee5a7693a20be56b60b965aa92b4727593dd811c (diff) | |
download | openshift-71e090a7a301ffd5ccef6bb78a28bfae96130ce6.tar.gz openshift-71e090a7a301ffd5ccef6bb78a28bfae96130ce6.tar.bz2 openshift-71e090a7a301ffd5ccef6bb78a28bfae96130ce6.tar.xz openshift-71e090a7a301ffd5ccef6bb78a28bfae96130ce6.zip |
Merge pull request #6225 from mtnbikenc/include-deprecation-openshift-etcd
Include Deprecation - openshift-etcd
Diffstat (limited to 'playbooks/openshift-etcd/private')
4 files changed, 9 insertions, 9 deletions
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 |