summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-16 10:10:27 -0700
committerGitHub <noreply@github.com>2017-10-16 10:10:27 -0700
commit41ea8e19e6efde5e5949e494718e2bcb87b73ec4 (patch)
tree6990bb0d2b336a80429da4cb9831d251d1987797 /playbooks/common/openshift-cluster
parenta374775dac136986e83d852d43a04e9afd5d68db (diff)
parent076ed1a0ea6176ed02e78f071e6375ab342e8c64 (diff)
downloadopenshift-41ea8e19e6efde5e5949e494718e2bcb87b73ec4.tar.gz
openshift-41ea8e19e6efde5e5949e494718e2bcb87b73ec4.tar.bz2
openshift-41ea8e19e6efde5e5949e494718e2bcb87b73ec4.tar.xz
openshift-41ea8e19e6efde5e5949e494718e2bcb87b73ec4.zip
Merge pull request #5734 from mtnbikenc/refactor-mgmt-entry
Automatic merge from submit-queue. Refactor openshift-management entry point Moves checkpointing steps into path for both full cluster install and individual entry point playbook.
Diffstat (limited to 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/config.yml2
-rw-r--r--playbooks/common/openshift-cluster/openshift_management.yml25
2 files changed, 1 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