diff options
| author | Russell Teague <rteague@redhat.com> | 2017-10-12 08:53:18 -0400 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2017-10-12 10:53:38 -0400 |
| commit | 076ed1a0ea6176ed02e78f071e6375ab342e8c64 (patch) | |
| tree | 4ba8d1d0f87b6c7f823675cdad1c933b80e2e50a /playbooks/common | |
| parent | 45725a38dd8ee6db16a89144f1e14c30f98440b8 (diff) | |
| download | openshift-076ed1a0ea6176ed02e78f071e6375ab342e8c64.tar.gz openshift-076ed1a0ea6176ed02e78f071e6375ab342e8c64.tar.bz2 openshift-076ed1a0ea6176ed02e78f071e6375ab342e8c64.tar.xz openshift-076ed1a0ea6176ed02e78f071e6375ab342e8c64.zip | |
Refactor openshift-management entry point
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_management.yml | 25 | ||||
| -rw-r--r-- | playbooks/common/openshift-management/config.yml | 20 |
3 files changed, 21 insertions, 26 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index dbe09dce2..395eb51f1 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -55,7 +55,7 @@ - include: service_catalog.yml when: openshift_enable_service_catalog | default(false) | bool -- include: openshift_management.yml +- include: ../openshift-management/config.yml when: openshift_management_install_management | default(false) | bool - name: Print deprecated variable warning message if necessary diff --git a/playbooks/common/openshift-cluster/openshift_management.yml b/playbooks/common/openshift-cluster/openshift_management.yml deleted file mode 100644 index 6e582920b..000000000 --- a/playbooks/common/openshift-cluster/openshift_management.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- name: Management Install Checkpoint Start - hosts: localhost - connection: local - gather_facts: false - tasks: - - name: Set Management install 'In Progress' - set_stats: - data: - installer_phase_Management: "In Progress" - aggregate: false - -- name: Management - include: ../openshift-management/config.yml - -- name: Management Install Checkpoint End - hosts: localhost - connection: local - gather_facts: false - tasks: - - name: Set Management install 'Complete' - set_stats: - data: - installer_phase_Management: "Complete" - aggregate: false diff --git a/playbooks/common/openshift-management/config.yml b/playbooks/common/openshift-management/config.yml index 0aaafe440..908679e81 100644 --- a/playbooks/common/openshift-management/config.yml +++ b/playbooks/common/openshift-management/config.yml @@ -1,4 +1,14 @@ --- +- name: Management Install Checkpoint Start + hosts: oo_all_hosts + gather_facts: false + tasks: + - name: Set Management install 'In Progress' + set_stats: + data: + installer_phase_management: "In Progress" + aggregate: false + - name: Setup CFME hosts: oo_first_master pre_tasks: @@ -13,3 +23,13 @@ name: openshift_management vars: template_dir: "{{ hostvars[groups.masters.0].r_openshift_management_mktemp.stdout }}" + +- name: Management Install Checkpoint End + hosts: oo_all_hosts + gather_facts: false + tasks: + - name: Set Management install 'Complete' + set_stats: + data: + installer_phase_management: "Complete" + aggregate: false |