diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-05 09:42:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-05 09:42:09 -0700 |
| commit | 6f06b5ed6ada0bf22051b7af79bd474ae2398ee9 (patch) | |
| tree | 2d54f3580de1580c14c956cbd9532338c1193d18 /playbooks/common/openshift-cluster | |
| parent | 8e2019c9c3840a64425c34c23ace9e9cbd6b7eb0 (diff) | |
| parent | d4c1a0443e7c38343752f880d6ae3c2c2c33ab54 (diff) | |
| download | openshift-6f06b5ed6ada0bf22051b7af79bd474ae2398ee9.tar.gz openshift-6f06b5ed6ada0bf22051b7af79bd474ae2398ee9.tar.bz2 openshift-6f06b5ed6ada0bf22051b7af79bd474ae2398ee9.tar.xz openshift-6f06b5ed6ada0bf22051b7af79bd474ae2398ee9.zip | |
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
Diffstat (limited to 'playbooks/common/openshift-cluster')
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 3 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_cfme.yml | 25 |
2 files changed, 28 insertions, 0 deletions
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 |