4 files changed, 28 insertions, 30 deletions
diff --git a/playbooks/common/openshift-cfme/config.yml b/playbooks/common/openshift-cfme/config.yml
index 3f3abd008..08df4a57e 100644
--- a/playbooks/common/openshift-cfme/config.yml
+++ b/playbooks/common/openshift-cfme/config.yml
@@ -1,19 +1,4 @@
 ---
-# TODO: Make this work. The 'name' variable below is undefined
-# presently because it's part of the cfme role. This play can't run
-# until that's re-worked.
-#
-# - name: Pre-Pull manageiq-pods docker images
-#   hosts: nodes
-#   tasks:
-#   - name: Ensure the latest manageiq-pods docker image is pulling
-#     docker_image:
-#       name: "{{ openshift_cfme_container_image }}"
-#     # Fire-and-forget method, never timeout
-#     async: 99999999999
-#     # F-a-f, never check on this. True 'background' task.
-#     poll: 0
-
 - name: Setup CFME
   hosts: oo_first_master
   pre_tasks:
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 4ca0d48e4..2b6f48468 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -56,6 +56,9 @@
 - include: service_catalog.yml
   when: openshift_enable_service_catalog | default(false) | bool
 
+- include: openshift_cfme.yml
+  when: openshift_cfme_install_cfme | default(false) | bool
+
 - name: Print deprecated variable warning message if necessary
   hosts: oo_first_master
   gather_facts: no
diff --git a/playbooks/common/openshift-cluster/openshift_cfme.yml b/playbooks/common/openshift-cluster/openshift_cfme.yml
new file mode 100644
index 000000000..29966d99e
--- /dev/null
+++ b/playbooks/common/openshift-cluster/openshift_cfme.yml
@@ -0,0 +1,25 @@
+---
+- name: CFME Install Checkpoint Start
+  hosts: localhost
+  connection: local
+  gather_facts: false
+  tasks:
+  - name: Set CFME install 'In Progress'
+    set_stats:
+      data:
+        installer_phase_cfme: "In Progress"
+      aggregate: false
+
+- name: CFME
+  include: ../openshift-cfme/config.yml
+
+- name: CFME Install Checkpoint End
+  hosts: localhost
+  connection: local
+  gather_facts: false
+  tasks:
+  - name: Set CFME install 'Complete'
+    set_stats:
+      data:
+        installer_phase_CFME: "Complete"
+      aggregate: false
diff --git a/roles/openshift_cfme/defaults/main.yml b/roles/openshift_cfme/defaults/main.yml
index 2c728b612..a1a6e7190 100644
--- a/roles/openshift_cfme/defaults/main.yml
+++ b/roles/openshift_cfme/defaults/main.yml
@@ -95,18 +95,3 @@ openshift_cfme_db_pv_size: 15Gi
 #
 # openshift_cfme_template_parameters={'APPLICATION_MEM_REQ': '512Mi'}
 openshift_cfme_template_parameters: {}
-
-######################################################################
-# Whether or not the cfme app should be initialized ('oc new-app
-# --template=manageiq). If False everything UP TO 'new-app' is ran.
-openshift_cfme_install_app: false
-
-# Docker image to pull
-# openshift_cfme_application_img_name: "{{ 'registry.access.redhat.com/cloudforms46/cfme-openshift-app' if openshift_deployment_type == 'openshift-enterprise' else 'docker.io/manageiq/manageiq-pods' }}"
-# openshift_cfme_application_img_tag: "{{ 'latest' if openshift_deployment_type == 'openshift-enterprise' else 'frontend-latest' }}"
-
-# openshift_cfme_memcached_img_name: "{{ 'registry.access.redhat.com/cloudforms46/cfme-openshift-memcached' if openshift_deployment_type == 'openshift-enterprise' else 'docker.io/manageiq/manageiq-pods' }}"
-# openshift_cfme_memcached_img_tag: "{{ 'latest' if openshift_deployment_type == 'openshift-enterprise' else 'memcached-latest-fine' }}"
-
-# openshift_cfme_postgresql_img_tag: "{{ 'latest' if openshift_deployment_type == 'openshift-enterprise' else 'postgresql-latest-fine' }}"
-# openshift_cfme_postgresql_img_name: "{{ 'registry.access.redhat.com/cloudforms46/cfme-openshift-postgresql' if openshift_deployment_type == 'openshift-enterprise' else 'docker.io/manageiq/manageiq-pods' }}"