diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-12-07 12:06:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-07 12:06:03 -0800 |
| commit | d6ea0d5f39637c6e888008621fa0193c0fa049f4 (patch) | |
| tree | abe7f41b27177748f69367780add5308a3507c2e /playbooks/openstack | |
| parent | f3b74371642fac62069cd369331ed18f07febf23 (diff) | |
| parent | e64462aa1dfedbdc9b0bc3fae22e3fcca8f5b83b (diff) | |
| download | openshift-d6ea0d5f39637c6e888008621fa0193c0fa049f4.tar.gz openshift-d6ea0d5f39637c6e888008621fa0193c0fa049f4.tar.bz2 openshift-d6ea0d5f39637c6e888008621fa0193c0fa049f4.tar.xz openshift-d6ea0d5f39637c6e888008621fa0193c0fa049f4.zip | |
Merge pull request #6371 from mtnbikenc/include-to-import_playbook
Automatic merge from submit-queue.
Include Deprecation: Convert to import_playbook
* Converts playbooks/ to use `import_playbook`.
* Updates remaining `include:` tasks to `include_tasks:`
Trello: https://trello.com/c/ZTyZu3UM/484-3-ansible-24-include-deprecation
Diffstat (limited to 'playbooks/openstack')
| -rw-r--r-- | playbooks/openstack/openshift-cluster/install.yml | 2 | ||||
| -rw-r--r-- | playbooks/openstack/openshift-cluster/provision.yml | 4 | ||||
| -rw-r--r-- | playbooks/openstack/openshift-cluster/provision_install.yml | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/playbooks/openstack/openshift-cluster/install.yml b/playbooks/openstack/openshift-cluster/install.yml index 8ed01b192..3211f619a 100644 --- a/playbooks/openstack/openshift-cluster/install.yml +++ b/playbooks/openstack/openshift-cluster/install.yml @@ -9,4 +9,4 @@ # some logic here? - name: run the cluster deploy - include: ../../deploy_cluster.yml + import_playbook: ../../deploy_cluster.yml diff --git a/playbooks/openstack/openshift-cluster/provision.yml b/playbooks/openstack/openshift-cluster/provision.yml index 3e295b2c8..583e72b51 100644 --- a/playbooks/openstack/openshift-cluster/provision.yml +++ b/playbooks/openstack/openshift-cluster/provision.yml @@ -10,7 +10,7 @@ # NOTE(shadower): Bring in the host groups: - name: evaluate groups - include: ../../init/evaluate_groups.yml + import_playbook: ../../init/evaluate_groups.yml - name: Wait for the nodes and gather their facts @@ -27,7 +27,7 @@ setup: - name: set common facts - include: ../../init/facts.yml + import_playbook: ../../init/facts.yml # TODO(shadower): consider splitting this up so people can stop here diff --git a/playbooks/openstack/openshift-cluster/provision_install.yml b/playbooks/openstack/openshift-cluster/provision_install.yml index 5d88c105f..fc2854605 100644 --- a/playbooks/openstack/openshift-cluster/provision_install.yml +++ b/playbooks/openstack/openshift-cluster/provision_install.yml @@ -1,9 +1,9 @@ --- - name: Check the prerequisites for cluster provisioning in OpenStack - include: prerequisites.yml + import_playbook: prerequisites.yml - name: Include the provision.yml playbook to create cluster - include: provision.yml + import_playbook: provision.yml - name: Include the install.yml playbook to install cluster - include: install.yml + import_playbook: install.yml |