Merge pull request #5336 from tbielawa/cfme_4.6

Automatic merge from submit-queue.

Cfme 4.6

# Description

* Implements support for **CFME 4.6** in OCP 3.7
* **Replaces** the Tech Preview CFME 4.5 release included in OCP 3.6
* Does not support graceful migrations from the CFME 4.5 tech preview release

# References

* [Trello - (5) Integrate CFME 4.6 into OCP Installation](https://trello.com/c/Rzfn5Qa8/380-5-integrate-cfme-46-into-ocp-installation)

Ensure the following RFE/Errors do not happen again

- [x] #4555 - Error creating the CFME user
- [x] #4556 - Error in PV template evaluation
- [x] #4822 - Changing `maxImagesBulkImportedPerRepository` parameter
- [x] #4568 - Add NFS directory support

# Features

Ensure the following features are configurable in the role

- [x] POC deployments can easily default to NFS storage
- [ ] Production/Cloud deployments can use automatic storage providers
- [ ] Able to select between podified vs. external PostgreSQL database (podified uses configured storage mechanism)
- [x] Template resource requests can be overridden for POC deployments

3 files changed, 28 insertions, 29 deletions

diff --git a/playbooks/common/openshift-cfme/config.yml b/playbooks/common/openshift-cfme/config.yml
index 533a35d9e..08df4a57e 100644
--- a/playbooks/common/openshift-cfme/config.yml
+++ b/playbooks/common/openshift-cfme/config.yml
@@ -1,40 +1,11 @@
 ---
-# 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: Configure Masters for CFME Bulk Image Imports
-  hosts: oo_masters_to_config
-  serial: 1
-  tasks:
-  - name: Run master cfme tuning playbook
-    include_role:
-      name: openshift_cfme
-      tasks_from: tune_masters
-
 - name: Setup CFME
   hosts: oo_first_master
-  vars:
-    r_openshift_cfme_miq_template_content: "{{ lookup('file', 'roles/openshift_cfme/files/miq-template.yaml') | from_yaml}}"
   pre_tasks:
   - name: Create a temporary place to evaluate the PV templates
     command: mktemp -d /tmp/openshift-ansible-XXXXXXX
     register: r_openshift_cfme_mktemp
     changed_when: false
-  - name: Ensure the server template was read from disk
-    debug:
-      msg="{{ r_openshift_cfme_miq_template_content | from_yaml }}"
 
   tasks:
   - name: Run the CFME Setup Role
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 96a43230d..76ca067e7 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -46,6 +46,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