diff options
| author | Russell Teague <rteague@redhat.com> | 2017-11-22 13:19:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-22 13:19:50 -0500 |
| commit | 254d39aa839a53856a37c842b120d35d97e846f5 (patch) | |
| tree | 9831aac7e0fe8a24918b4a3fa00c85f5768ba720 | |
| parent | f983b99d4a4acd1e3922305190dbe854227cccc0 (diff) | |
| parent | 9a0912ee6cf331d7a60044fc04621ad8bdaa7d94 (diff) | |
| download | openshift-254d39aa839a53856a37c842b120d35d97e846f5.tar.gz openshift-254d39aa839a53856a37c842b120d35d97e846f5.tar.bz2 openshift-254d39aa839a53856a37c842b120d35d97e846f5.tar.xz openshift-254d39aa839a53856a37c842b120d35d97e846f5.zip | |
Merge pull request #6230 from mtnbikenc/include-deprecation-openshift-hosted
Include Deprecation - openshift-hosted
| -rw-r--r-- | playbooks/openshift-hosted/config.yml | 4 | ||||
| -rw-r--r-- | playbooks/openshift-hosted/private/config.yml | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/playbooks/openshift-hosted/config.yml b/playbooks/openshift-hosted/config.yml index 8ee57ce8d..c7814207c 100644 --- a/playbooks/openshift-hosted/config.yml +++ b/playbooks/openshift-hosted/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-hosted/private/config.yml b/playbooks/openshift-hosted/private/config.yml index 6bcd02ba2..036fe654d 100644 --- a/playbooks/openshift-hosted/private/config.yml +++ b/playbooks/openshift-hosted/private/config.yml @@ -11,19 +11,19 @@ status: "In Progress" start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}" -- include: create_persistent_volumes.yml +- import_playbook: create_persistent_volumes.yml -- include: openshift_default_storage_class.yml +- import_playbook: openshift_default_storage_class.yml -- include: openshift_hosted_create_projects.yml +- import_playbook: openshift_hosted_create_projects.yml -- include: openshift_hosted_router.yml +- import_playbook: openshift_hosted_router.yml -- include: openshift_hosted_registry.yml +- import_playbook: openshift_hosted_registry.yml -- include: cockpit-ui.yml +- import_playbook: cockpit-ui.yml -- include: install_docker_gc.yml +- import_playbook: install_docker_gc.yml when: - openshift_use_crio | default(False) | bool - openshift_crio_enable_docker_gc | default(False) | bool |