Rename openshift_cfme role to openshift_management

32 files changed, 0 insertions, 4925 deletions

diff --git a/roles/openshift_cfme/README.md b/roles/openshift_cfme/README.md
deleted file mode 100644
index 26618ffb8..000000000
--- a/roles/openshift_cfme/README.md
+++ /dev/null
@@ -1,467 +0,0 @@
-# CloudForms Availability
-
-As noted in [Limitations - Product Choice](#product-choice),
-[CloudForms](https://www.redhat.com/en/technologies/management/cloudforms)
-(CFME) 4.6 is not yet released. Until such time, this role is limited
-to installing [ManageIQ](http://manageiq.org) (MIQ), the open source
-project that CFME is based on.
-
-After CFME 4.6 is available to customers this role will enable
-(optional) logic which will install CFME or MIQ based on your
-deployment type (`openshift_deployment_type`):
-
-* `openshift-enterprise` → CloudForms
-* `origin` → ManageIQ
-
-
-# Table of Contents
-
-   * [Introduction](#introduction)
-      * [Important Notes](#important-notes)
-   * [Requirements](#requirements)
-   * [Role Variables](#role-variables)
-   * [Getting Started](#getting-started)
-      * [All Defaults](#all-defaults)
-      * [External NFS Storage](#external-nfs-storage)
-      * [Override PV sizes](#override-pv-sizes)
-      * [Override Memory Requirements](#override-memory-requirements)
-      * [External PostgreSQL Database](#external-postgresql-database)
-   * [Limitations](#limitations)
-      * [Product Choice](#product-choice)
-   * [Configuration](#configuration)
-      * [Database](#database)
-         * [Podified](#podified)
-         * [External](#external)
-      * [Storage Classes](#storage-classes)
-         * [NFS (Default)](#nfs-default)
-         * [NFS External](#nfs-external)
-         * [Cloud Provider](#cloud-provider)
-         * [Preconfigured (Expert Configuration Only)](#preconfigured-expert-configuration-only)
-   * [Customization](#customization)
-   * [Additional Information](#additional-information)
-
-# Introduction
-
-This role will allow a user to install CFME 4.6 or MIQ on an OCP
-3.7 cluster. The role provides customization options for overriding
-default deployment parameters. This role allows the user to deploy
-different installation flavors:
-
-* **Fully Podified** - In this way all application services are ran as
-  pods in the container platform.
-* **External Database** - In this way the application utilizes an
-  externally hosted database server. All other services are ran in the
-  container platform.
-
-This role includes the following storage class options:
-
-* NFS - **Default** - local, on cluster
-* NFS External - NFS somewhere else, like a storage appliance
-* Cloud Provider - Use automatic storage provisioning from your cloud
-  provider (*gce* or *aws*)
-* Preconfigured - **expert only**, assumes you created everything ahead
-  of time
-
-You may skip ahead to the [Getting Started](#getting-started) section
-now for examples of how to set up your Ansible inventory for various
-deployment configurations. However, you are **strongly urged** to
-first read through the [Configuration](#configuration) and
-[Customization](#customization) sections as well as the following
-[Important Notes](#important-notes).
-
-## Important Notes
-
-Not all parameters are present in **both** template versions (podified
-db and external db). For example, while the podified database template
-has a `POSTGRESQL_MEM_REQ` parameter, no such parameter is present in
-the external db template, as there is no need for this information due
-to there being no databases that require pods.
-
-*Be extra careful* if you are overriding template
-parameters. Including parameters not defined in a template **will
-cause errors**.
-
-**Container Provider Integration** - If you want add your container
-platform (OCP/Origin) as a *Container Provider* in CFME/MIQ then you
-must ensure that the infrastructure management hooks are installed.
-
-* During your OCP/Origin install, ensure that you have the
-  `openshift_use_manageiq` parameter set to `true` in your inventory
-  at install time. This will create a `management-infra` project and a
-  service account user.
-* After CFME/MIQ is installed, obtain the `management-admin` service
-  account token and copy it somewhere safe.
-
-```bash
-$ oc serviceaccounts get-token -n management-infra management-admin
-eyJhuGdiOiJSUzI1NiIsInR5dCI6IkpXVCJ9.eyJpd9MiOiJrbWJldm5lbGVzL9NldnZpY2VhY2NvbW50Iiwiy9ViZXJuZXRldy5puy9zZXJ2yWNlYWNju9VubC9uYW1ld9BhY2UiOiJtYW5hZ2VtZW50LWluZnJhIiwiy9ViZXJuZXRldy5puy9zZXJ2yWNlYWNju9VubC9zZWNyZXQuumFtZSI6Im1humFnZW1lunQtYWRtyW4tbG9rZW4tdDBnOTAiLCJrbWJldm5lbGVzLmlvL9NldnZpY2VhY2NvbW50L9NldnZpY2UtYWNju9VubC5uYW1lIjoiuWFuYWbluWVubC1hZG1puiIsImt1YmVyumV0ZXMuyW8vd2VybmljZWFjY291unQvd2VybmljZS1hY2NvbW50LnVpZCI6IjRiZDM2MWQ1LWE1NDAtMTFlNy04YzI5LTUyNTQwMDliMmNkZCIsInN1YiI6InN5d9RluTpzZXJ2yWNlYWNju9VubDptYW5hZ2VtZW50LWluZnJhOm1humFnZW1lunQtYWRtyW4ifQ.B6sZLGD9O4vBu9MHwiG-C_4iEwjBXb7Af8BPw-LNlujDmHhOnQ-Oo4QxQKyj9edynfmDy2yutUyJ2Mm9HfDGWg4C9xhWImHoq6Nl7T5_9djkeGKkK7Ejvg4fA-IkrzEsZeQuluBvXnE6wvP0LCjUo_dx4pPyZJyp46teV9NqKQeDzeysjlMCyqp6AK6-Lj8ILG8YA6d_97HlzL_EgFBLAu0lBSn-uC_9J0gLysqBtK6TI0nExfhv9Bm1_5bdHEbKHPW7xIlYlI9AgmyTyhsQ6SoQWtL2khBjkG9TlPBq9wYJj9bzqgVZlqEfICZxgtXO7sYyuoje4y8lo0YQ0kZmig
-```
-
-* In the CFME/MIQ web interface, navigate to `Compute` →
-  `Containers` → `Providers` and select `⚙ Configuration` → `⊕
-  Add a new Containers Provider`
-
-*See the [upstream documentation](http://manageiq.org/docs/reference/latest/doc-Managing_Providers/miq/index.html#containers-providers) for additional information.*
-
-
-
-# Requirements
-
-The **default** requirements are listed in the table below. These can
-be overridden through customization parameters (See
-[Customization](#customization), below).
-
-**Note** that the application performance will suffer, or possibly
-even fail to deploy, if these requirements are not satisfied.
-
-
-| Item                | Requirement   | Description                                  | Customization Parameter       |
-|---------------------|---------------|----------------------------------------------|-------------------------------|
-| Application Memory  | `≥ 4.0 Gi`    | Minimum required memory for the application  | `APPLICATION_MEM_REQ`         |
-| Application Storage | `≥ 5.0 Gi`    | Minimum PV size required for the application | `APPLICATION_VOLUME_CAPACITY` |
-| PostgreSQL Memory   | `≥ 6.0 Gi`    | Minimum required memory for the database     | `POSTGRESQL_MEM_REQ`          |
-| PostgreSQL Storage  | `≥ 15.0 Gi`   | Minimum PV size required for the database    | `DATABASE_VOLUME_CAPACITY`    |
-| Cluster Hosts       | `≥ 3`         | Number of hosts in your cluster              |                               |
-
-The implications of this table are summarized below:
-
-* You need several cluster nodes
-* Your cluster nodes must have lots of memory available
-* You will need several GiB's of storage available, either locally or
-  on your cloud provider
-* PV sizes can be changed by providing override values to template
-  parameters (see also: [Customization](#customization))
-
-# Role Variables
-
-The following is a table of the publicly exposed variables that may be
-used in your Ansible inventory to control the behavior of this
-installer.
-
-
-| Variable                                       | Required | Default                        | Description                         |
-|------------------------------------------------|:--------:|:------------------------------:|-------------------------------------|
-| `openshift_cfme_project`                       | **No**   | `openshift-cfme`               | Namespace for the installation.     |
-| `openshift_cfme_project_description`           | **No**   | *CloudForms Management Engine* | Namespace/project description.      |
-| `openshift_cfme_install_cfme`                  | **No**   | `false`                        | Boolean, set to `true` to install the application |
-| **PRODUCT CHOICE**  | | | | |
-| `openshift_cfme_app_template`                  | **No**   | `miq-template`                 | The project flavor to install. Choices: <ul><li>`miq-template`: ManageIQ using a podified database</li> <li> `miq-template-ext-db`: ManageIQ using an external database</li> <li>`cfme-template`: CloudForms using a podified database<sup>[1]</sup></li> <li> `cfme-template-ext-db`: CloudForms using an external database.<sup>[1]</sup></li></ul> |
-| **STORAGE CLASSES** | | | | |
-| `openshift_cfme_storage_class`                 | **No**   | `nfs`                          | Storage type to use, choices: <ul><li>`nfs` - Best used for proof-of-concept installs. Will setup NFS on a cluster host (defaults to your first master in the inventory file) to back the required PVCs. The application requires a PVC and the database (which may be hosted externally) may require a second. PVC minimum required sizes are 5GiB for the MIQ application, and 15GiB for the PostgreSQL database (20GiB minimum available space on a volume/partition if used specifically for NFS purposes)</li> <li>`nfs_external` - You are using an external NFS server, such as a netapp appliance. See the [Configuration - Storage Classes](#storage-classes) section below for required information.</li> <li>`preconfigured` - This CFME role will do NOTHING to modify storage settings. This option assumes expert knowledge and that you have done everything required ahead of time.</li> <li>`cloudprovider` - You are using an OCP cloudprovider integration for your storage class. For this to work you must have already configured the required inventory parameters for your cloud provider. Ensure `openshift_cloudprovider_kind` is defined (aws or gce) and that the applicable cloudprovider parameters are provided. |
-| `openshift_cfme_storage_nfs_external_hostname` | **No**   | `false`                        | If you are using an *external NFS server*, such as a netapp appliance, then you must set the hostname here. Leave the value as `false` if you are not using external NFS. <br /> *Additionally*: **External NFS REQUIRES** that you create the NFS exports that will back the application PV and optionally the database PV.
-| `openshift_cfme_storage_nfs_base_dir`          | **No**   | `/exports/`                    | If you are using **External NFS** then you may set the base path to the exports location here. <br />**Local NFS Note**: You *may* also change this value if you want to change the default path used for local NFS exports. |
-| `openshift_cfme_storage_nfs_local_hostname`    | **No**   | `false`                        | If you do not have an `[nfs]` group in your inventory, or want to simply manually define the local NFS host in your cluster, set this parameter to the hostname of the preferred NFS server. The server must be a part of your OCP/Origin cluster. |
-| **CUSTOMIZATION OPTIONS** | | | | |
-| `openshift_cfme_template_parameters`           | **No**   | `{}`                           | A dictionary of any parameters you want to override in the application/pv templates.
-
-* <sup>[1]</sup> The `cfme-template`s will be available and
-  automatically detected once CFME 4.6 is released
-
-
-# Getting Started
-
-Below are some inventory snippets that can help you get started right
-away.
-
-If you want to install CFME/MIQ at the same time you install your
-OCP/Origin cluster, ensure that `openshift_cfme_install_cfme` is set
-to `true` in your inventory. Call the standard
-`playbooks/byo/config.yml` playbook to begin the cluster and CFME/MIQ
-installation.
-
-If you are installing CFME/MIQ on an *already provisioned cluster*
-then you can call the CFME/MIQ playbook directly:
-
-```
-$ ansible-playbook -v -i <YOUR_INVENTORY> playbooks/byo/openshift-cfme/config.yml
-```
-
-*Note: Use `miq-template` in the following examples for ManageIQ installs*
-
-## All Defaults
-
-This example is the simplest. All of the default values and choices
-are used. This will result in a fully podified CFME installation. All
-application components, as well as the PostgreSQL database will be
-created as pods in the container platform.
-
-```ini
-[OSEv3:vars]
-openshift_cfme_app_template=cfme-template
-```
-
-## External NFS Storage
-
-This is as the previous example, except that instead of using local
-NFS services in the cluster it will use an external NFS server (such
-as a storage appliance). Note the two new parameters:
-
-* `openshift_cfme_storage_class` - set to `nfs_external`
-* `openshift_cfme_storage_nfs_external_hostname` - set to the hostname
-  of the NFS server
-
-```ini
-[OSEv3:vars]
-openshift_cfme_app_template=cfme-template
-openshift_cfme_storage_class=nfs_external
-openshift_cfme_storage_nfs_external_hostname=nfs.example.com
-```
-
-If the external NFS host exports directories under a different parent
-directory, such as `/exports/hosted/prod` then we would add an
-additional parameter, `openshift_cfme_storage_nfs_base_dir`:
-
-```ini
-# ...
-openshift_cfme_storage_nfs_base_dir=/exports/hosted/prod
-```
-
-## Override PV sizes
-
-This example will override the PV sizes. Note that we set the PV sizes
-in the template parameters, `openshift_cfme_template_parameters`. This
-ensures that the application/db will be able to make claims on created
-PVs without clobbering each other.
-
-```ini
-[OSEv3:vars]
-openshift_cfme_app_template=cfme-template
-openshift_cfme_template_parameters={'APPLICATION_VOLUME_CAPACITY': '10Gi', 'DATABASE_VOLUME_CAPACITY': '25Gi'}
-```
-
-## Override Memory Requirements
-
-In a test or proof-of-concept installation you may need to reduce the
-application/database memory requirements to fit within your
-capacity. Note that reducing memory limits can result in reduced
-performance or a complete failure to initialize the application.
-
-```ini
-[OSEv3:vars]
-openshift_cfme_app_template=cfme-template
-openshift_cfme_template_parameters={'APPLICATION_MEM_REQ': '3000Mi', 'POSTGRESQL_MEM_REQ': '1Gi', 'ANSIBLE_MEM_REQ': '512Mi'}
-```
-
-Here we have instructed the installer to process the application
-template with the parameter `APPLICATION_MEM_REQ` set to `3000Mi`,
-`POSTGRESQL_MEM_REQ` set to `1Gi`, and `ANSIBLE_MEM_REQ` set to
-`512Mi`.
-
-These parameters can be combined with the PV size override parameters
-displayed in the previous example.
-
-## External PostgreSQL Database
-
-To use an external database you must change the
-`openshift_cfme_app_template` parameter value to `miq-template-ext-db`
-or `cfme-template-ext-db`.
-
-Additionally, database connection information **must** be supplied in
-the `openshift_cfme_template_parameters` customization parameter. See
-[Customization - Database - External](#external) for more
-information.
-
-```ini
-[OSEv3:vars]
-openshift_cfme_app_template=cfme-template-ext-db
-openshift_cfme_template_parameters={'DATABASE_USER': 'root', 'DATABASE_PASSWORD': 'r1ck&M0r7y', 'DATABASE_IP': '10.10.10.10', 'DATABASE_PORT': '5432', 'DATABASE_NAME': 'cfme'}
-```
-
-# Limitations
-
-This release is the first OpenShift CFME release in the OCP 3.7
-series. It is not complete yet.
-
-## Product Choice
-
-Due to staggered release dates, **CFME support is not
-integrated**. Presently this role will only deploy a ManageIQ
-installation. This role will be updated once CFME 4.6 is released and
-this limitation note will be removed.
-
-# Configuration
-
-Before you can deploy CFME you must decide *how* you want to deploy
-it. There are two major decisions to make:
-
-1. Do you want an external, or a podified database?
-1. Which storage class will back your PVs?
-
-## Database
-
-### Podified
-
-Any `POSTGRES_*` or `DATABASE_*` template parameters in
-[miq-template.yaml](files/templates/manageiq/miq-template.yaml) or
-[cfme-template.yaml](files/templates/cloudforms/cfme-template.yaml)
-may be customized through the `openshift_cfme_template_parameters`
-hash.
-
-### External
-
-Any `POSTGRES_*` or `DATABASE_*` template parameters in
-[miq-template-ext-db.yaml](files/templates/manageiq/miq-template-ext-db.yaml)
-or
-[cfme-template-ext-db.yaml](files/templates/cloudforms/cfme-template-ext-db.yaml)
-may be customized through the `openshift_cfme_template_parameters`
-hash.
-
-External PostgreSQL databases require you to provide database
-connection parameters. You must set the required connection keys in
-the `openshift_cfme_template_parameters` parameter in your
-inventory. The following keys are required:
-
-* `DATABASE_USER`
-* `DATABASE_PASSWORD`
-* `DATABASE_IP`
-* `DATABASE_PORT` - *note: Most PostgreSQL servers run on port `5432`*
-* `DATABASE_NAME`
-
-Your inventory would contain a line similar to this:
-
-```ini
-[OSEv3:vars]
-openshift_cfme_app_template=cfme-template-ext-db
-openshift_cfme_template_parameters={'DATABASE_USER': 'root', 'DATABASE_PASSWORD': 'r1ck&M0r7y', 'DATABASE_IP': '10.10.10.10', 'DATABASE_PORT': '5432', 'DATABASE_NAME': 'cfme'}
-```
-
-**Note** the new value for the `openshift_cfme_app_template`
-parameter, `cfme-template-ext-db` (ManageIQ installations would use
-`miq-template-ext-db` instead).
-
-At run time you may run into errors similar to this:
-
-```
-TASK [openshift_cfme : Ensure the CFME App is created] ***********************************
-task path: /home/tbielawa/rhat/os/openshift-ansible/roles/openshift_cfme/tasks/main.yml:74
-Tuesday 03 October 2017  15:30:44 -0400 (0:00:00.056)       0:00:12.278 *******
-{"cmd": "/usr/bin/oc create -f /tmp/postgresql-ZPEWQS -n openshift-cfme", "kind": "Endpoints", "results": {}, "returncode": 1, "stderr": "Error from server (BadRequest): error when creating \"/tmp/postgresql-ZPEWQS\": Endpoints in version \"v1\" cannot be handled as a Endpoints: [pos 218]: json: decNum: got first char 'f'\n", "stdout": ""}
-```
-
-Or like this:
-
-```
-TASK [openshift_cfme : Ensure the CFME App is created] ***********************************
-task path: /home/tbielawa/rhat/os/openshift-ansible/roles/openshift_cfme/tasks/main.yml:74
-Tuesday 03 October 2017  16:05:36 -0400 (0:00:00.052)       0:00:18.948 *******
-fatal: [m01.example.com]: FAILED! => {"changed": true, "failed": true, "msg":
-{"cmd": "/usr/bin/oc create -f /tmp/postgresql-igS5sx -n openshift-cfme", "kind": "Endpoints", "results": {}, "returncode": 1, "stderr": "The Endpoints \"postgresql\" is invalid: subsets[0].addresses[0].ip: Invalid value: \"doo\": must be a valid IP address, (e.g. 10.9.8.7)\n", "stdout": ""},
-```
-
-While intimidating at first, there are useful bits of information in
-here. Examine the error output closely and we can tell exactly what is
-wrong.
-
-In the first example we see `Endpoints in version \"v1\" cannot be
-handled as a Endpoints: [pos 218]: json: decNum: got first char
-...`. This is because in my example I used the value `foo` for the
-parameter `DATABASE_PORT`.
-
-In the second example we see `The Endpoints \"postgresql\" is invalid:
-subsets[0].addresses[0].ip: Invalid value: \"doo\": must be a valid IP
-address ...`. This is because in my example I used the value `doo` in
-the `DATABASE_IP` field.
-
-Luckily for us when the templates are processed behind the scenes they
-are also running type checking validation. So, don't worry, just look
-closely at the errors and ensure you are providing the correct values
-for each parameter.
-
-## Storage Classes
-
-OpenShift CFME supports several storage class options.
-
-### NFS (Default)
-
-The NFS storage class is best suited for proof-of-concept and
-test/demo deployments. It is also the **default** storage class for
-deployments. No additional configuration is required for this
-choice.
-
-Customization is provided through the following role variables:
-
-* `openshift_cfme_storage_nfs_base_dir`
-* `openshift_cfme_storage_nfs_local_hostname`
-
-### NFS External
-
-External NFS leans on pre-configured NFS servers to provide exports
-for the required PVs. For external NFS you must have:
-
-* For CFME: a `cfme-app` and optionally a `cfme-db` (for podified database) exports
-* For ManageIQ: an `miq-app` and optionally an `miq-db` (for podified database) exports
-
-Configuration is provided through the following role variables:
-
-* `openshift_cfme_storage_nfs_external_hostname`
-* `openshift_cfme_storage_nfs_base_dir`
-
-The `openshift_cfme_storage_nfs_external_hostname` parameter must be
-set to the hostname or IP of your external NFS server.
-
-If `/exports` is not the parent directory to your exports then you
-must set the base directory via the
-`openshift_cfme_storage_nfs_base_dir` parameter.
-
-For example, if your server export is `/exports/hosted/prod/cfme-app`
-then you must set
-`openshift_cfme_storage_nfs_base_dir=/exports/hosted/prod`.
-
-### Cloud Provider
-
-CFME can also use a cloud provider storage to back required PVs. For
-this functionality to work you must have also configured the
-`openshift_cloudprovider_kind` variable and all associated parameters
-specific to your chosen cloud provider.
-
-Using this storage class, when the application is created the required
-PVs will automatically be provisioned using the configured cloud
-provider storage integration.
-
-There are no additional variables to configure the behavior of this
-storage class.
-
-### Preconfigured (Expert Configuration Only)
-
-The *preconfigured* storage class implies that you know exactly what
-you're doing and that all storage requirements have been taken care
-ahead of time. Typically this means that you've already created the
-correctly sized PVs.
-
-There are no additional variables to configure the behavior of this
-storage class.
-
-# Customization
-
-Application and database parameters may be customized by means of the
-`openshift_cfme_template_parameters` inventory parameter.
-
-**For example**, if you wanted to reduce the memory requirement of the
-PostgreSQL pod then you could configure the parameter like this:
-
-`openshift_cfme_template_parameters={'POSTGRESQL_MEM_REQ': '1Gi'}`
-
-When the CFME template is processed `1Gi` will be used for the value
-of the `POSTGRESQL_MEM_REQ` template parameter.
-
-Any parameter in the `parameters` section of the
-[miq-template.yaml](files/templates/manageiq/miq-template.yaml) or
-[miq-template-ext-db.yaml](files/templates/manageiq/miq-template-ext-db.yaml)
-may be overridden through the `openshift_cfme_template_parameters`
-hash. This applies to **CloudForms** installations as well:
-[cfme-template.yaml](files/templates/cloudforms/cfme-template.yaml),
-[cfme-template-ext-db.yaml](files/templates/cloudforms/cfme-template-ext-db.yaml).
-
-
-# Additional Information
-
-The upstream project,
-[@manageiq/manageiq-pods](https://github.com/ManageIQ/manageiq-pods),
-contains a wealth of additional information useful for managing and
-operating your CFME installation. Topics include:
-
-* [Verifying Successful Installation](https://github.com/ManageIQ/manageiq-pods#verifying-the-setup-was-successful)
-* [Disabling Image Change Triggers](https://github.com/ManageIQ/manageiq-pods#disable-image-change-triggers)
-* [Scaling CFME](https://github.com/ManageIQ/manageiq-pods#scale-miq)
-* [Backing up and Restoring the DB](https://github.com/ManageIQ/manageiq-pods#backup-and-restore-of-the-miq-database)
-* [Troubleshooting](https://github.com/ManageIQ/manageiq-pods#troubleshooting)
diff --git a/roles/openshift_cfme/defaults/main.yml b/roles/openshift_cfme/defaults/main.yml
deleted file mode 100644
index 8ba672262..000000000
--- a/roles/openshift_cfme/defaults/main.yml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-# Namespace for the CFME project
-openshift_cfme_project: openshift-cfme
-# Namespace/project description
-openshift_cfme_project_description: CloudForms Management Engine
-
-######################################################################
-# BASE TEMPLATE AND DATABASE OPTIONS
-######################################################################
-# Which flavor of CFME would you like? You may install CFME using a
-# podified PostgreSQL server, or you may choose to use an existing
-# PostgreSQL server.
-#
-# Choose 'miq-template' for a podified database install
-# Choose 'miq-template-ext-db' for an external database install
-openshift_cfme_app_template: miq-template
-# If you are using the miq-template-ext-db template then you must add
-# the required database parameters to the
-# openshift_cfme_template_parameters variable.
-
-######################################################################
-# STORAGE OPTIONS
-######################################################################
-# DEFAULT - 'nfs'
-# Allowed options: nfs, nfs_external, preconfigured, cloudprovider.
-openshift_cfme_storage_class: nfs
-# * nfs - Best used for proof-of-concept installs. Will setup NFS on a
-#   cluster host (defaults to your first master in the inventory file)
-#   to back the required PVCs. The application requires a PVC and the
-#   database (which may be hosted externally) may require a
-#   second. PVC minimum required sizes are: 5GiB for the MIQ
-#   application, and 15GiB for the PostgreSQL database (20GiB minimum
-#   available space on an volume/partition if used specifically for
-#   NFS purposes)
-#
-# * nfs_external - You are using an external NFS server, such as a
-#   netapp appliance. See the STORAGE - NFS OPTIONS section below for
-#   required information.
-#
-# * preconfigured - This CFME role will do NOTHING to modify storage
-#   settings. This option assumes expert knowledge and that you have
-#   done everything required ahead of time.
-#
-# * cloudprovider - You are using an OCP cloudprovider integration for
-#   your storage class. For this to work you must have already
-#   configured the required inventory parameters for your cloud
-#   provider
-#
-#   Ensure 'openshift_cloudprovider_kind' is defined (aws or gce) and
-#   that the applicable cloudprovider parameters are provided.
-
-#---------------------------------------------------------------------
-# STORAGE - NFS OPTIONS
-#---------------------------------------------------------------------
-# [OPTIONAL] - If you are using an EXTERNAL NFS server, such as a
-# netapp appliance, then you must set the hostname here. Leave the
-# value as 'false' if you are not using external NFS.
-openshift_cfme_storage_nfs_external_hostname: false
-# [OPTIONAL] - If you are using external NFS then you must set the base
-# path to the exports location here.
-#
-# Additionally: EXTERNAL NFS REQUIRES that YOU CREATE the nfs exports
-# that will back the application PV and optionally the database
-# pv. Export path definitions, relative to
-# {{ openshift_cfme_storage_nfs_base_dir }}
-#
-# LOCAL NFS NOTE:
-#
-# You may may also change this value if you want to change the default
-# path used for local NFS exports.
-openshift_cfme_storage_nfs_base_dir: /exports
-#
-# LOCAL NFS NOTE:
-#
-# You may override the automatically selected LOCAL NFS server by
-# setting this variable. Useful for testing specific task files.
-openshift_cfme_storage_nfs_local_hostname: false
-
-######################################################################
-# SCAFFOLDING - These are parameters we pre-seed that a user may or
-# may not set later
-######################################################################
-# A hash of parameters you want to override or set in the
-# miq-template.yaml or miq-template-ext-db.yaml templates. Set this in
-# your inventory file as a simple hash. Acceptable values are defined
-# under the .parameters list in files/miq-template{-ext-db}.yaml
-# Example:
-#
-# openshift_cfme_template_parameters={'APPLICATION_MEM_REQ': '512Mi'}
-openshift_cfme_template_parameters: {}
diff --git a/roles/openshift_cfme/files/templates/cloudforms/cfme-backup-job.yaml b/roles/openshift_cfme/files/templates/cloudforms/cfme-backup-job.yaml
deleted file mode 100644
index c3bc1d20c..000000000
--- a/roles/openshift_cfme/files/templates/cloudforms/cfme-backup-job.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: cloudforms-backup
-spec:
-  template:
-    metadata:
-      name: cloudforms-backup
-    spec:
-      containers:
-      - name: postgresql
-        image: brew-pulp-docker01.web.prod.ext.phx2.redhat.com:8888/cloudforms46/cfme-openshift-postgresql:latest
-        command:
-        - "/opt/rh/cfme-container-scripts/backup_db"
-        env:
-        - name: DATABASE_URL
-          valueFrom:
-            secretKeyRef:
-              name: cloudforms-secrets
-              key: database-url
-        volumeMounts:
-        - name: cfme-backup-vol
-          mountPath: "/backups"
-      volumes:
-      - name: cfme-backup-vol
-        persistentVolumeClaim:
-          claimName: cloudforms-backup
-      restartPolicy: Never
diff --git a/roles/openshift_cfme/files/templates/cloudforms/cfme-backup-pvc.yaml b/roles/openshift_cfme/files/templates/cloudforms/cfme-backup-pvc.yaml
deleted file mode 100644
index 92598ce82..000000000
--- a/roles/openshift_cfme/files/templates/cloudforms/cfme-backup-pvc.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: cloudforms-backup
-spec:
-  accessModes:
-  - ReadWriteOnce
-  resources:
-    requests:
-      storage: 15Gi
diff --git a/roles/openshift_cfme/files/templates/cloudforms/cfme-pv-backup-example.yaml b/roles/openshift_cfme/files/templates/cloudforms/cfme-pv-backup-example.yaml
deleted file mode 100644
index 4fe349897..000000000
--- a/roles/openshift_cfme/files/templates/cloudforms/cfme-pv-backup-example.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: cfme-pv03
-spec:
-  capacity:
-    storage: 15Gi
-  accessModes:
-  - ReadWriteOnce
-  nfs:
-    path: "/exports/cfme-pv03"
-    server: "<your-nfs-host-here>"
-  persistentVolumeReclaimPolicy: Retain
diff --git a/roles/openshift_cfme/files/templates/cloudforms/cfme-pv-db-example.yaml b/roles/openshift_cfme/files/templates/cloudforms/cfme-pv-db-example.yaml
deleted file mode 100644
index 0cdd821b5..000000000
--- a/roles/openshift_cfme/files/templates/cloudforms/cfme-pv-db-example.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-apiVersion: v1
-kind: Template
-labels:
-  template: cloudforms-db-pv
-metadata:
-  name: cloudforms-db-pv
-  annotations:
-    description: PV Template for CFME PostgreSQL DB
-    tags: PVS, CFME
-objects:
-- apiVersion: v1
-  kind: PersistentVolume
-  metadata:
-    name: cfme-db
-  spec:
-    capacity:
-      storage: "${PV_SIZE}"
-    accessModes:
-    - ReadWriteOnce
-    nfs:
-      path: "${BASE_PATH}/cfme-db"
-      server: "${NFS_HOST}"
-    persistentVolumeReclaimPolicy: Retain
-parameters:
-- name: PV_SIZE
-  displayName: PV Size for DB
-  required: true
-  description: The size of the CFME DB PV given in Gi
-  value: 15Gi
-- name: BASE_PATH
-  displayName: Exports Directory Base Path
-  required: true
-  description: The parent directory of your NFS exports
-  value: "/exports"
-- name: NFS_HOST
-  displayName: NFS Server Hostname
-  required: true
-  description: The hostname or IP address of the NFS server
diff --git a/roles/openshift_cfme/files/templates/cloudforms/cfme-pv-server-example.yaml b/roles/openshift_cfme/files/templates/cloudforms/cfme-pv-server-example.yaml
deleted file mode 100644
index 527090ae8..000000000
--- a/roles/openshift_cfme/files/templates/cloudforms/cfme-pv-server-example.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-apiVersion: v1
-kind: Template
-labels:
-  template: cloudforms-app-pv
-metadata:
-  name: cloudforms-app-pv
-  annotations:
-    description: PV Template for CFME Server
-    tags: PVS, CFME
-objects:
-- apiVersion: v1
-  kind: PersistentVolume
-  metadata:
-    name: cfme-app
-  spec:
-    capacity:
-      storage: "${PV_SIZE}"
-    accessModes:
-    - ReadWriteOnce
-    nfs:
-      path: "${BASE_PATH}/cfme-app"
-      server: "${NFS_HOST}"
-    persistentVolumeReclaimPolicy: Retain
-parameters:
-- name: PV_SIZE
-  displayName: PV Size for App
-  required: true
-  description: The size of the CFME APP PV given in Gi
-  value: 5Gi
-- name: BASE_PATH
-  displayName: Exports Directory Base Path
-  required: true
-  description: The parent directory of your NFS exports
-  value: "/exports"
-- name: NFS_HOST
-  displayName: NFS Server Hostname
-  required: true
-  description: The hostname or IP address of the NFS server
diff --git a/roles/openshift_cfme/files/templates/cloudforms/cfme-restore-job.yaml b/roles/openshift_cfme/files/templates/cloudforms/cfme-restore-job.yaml
deleted file mode 100644
index 8b23f8a33..000000000
--- a/roles/openshift_cfme/files/templates/cloudforms/cfme-restore-job.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: cloudforms-restore
-spec:
-  template:
-    metadata:
-      name: cloudforms-restore
-    spec:
-      containers:
-      - name: postgresql
-        image: brew-pulp-docker01.web.prod.ext.phx2.redhat.com:8888/cloudforms46/cfme-openshift-postgresql:latest
-        command:
-        - "/opt/rh/cfme-container-scripts/restore_db"
-        env:
-        - name: DATABASE_URL
-          valueFrom:
-            secretKeyRef:
-              name: cloudforms-secrets
-              key: database-url
-        - name: BACKUP_VERSION
-          value: latest
-        volumeMounts:
-        - name: cfme-backup-vol
-          mountPath: "/backups"
-        - name: cfme-prod-vol
-          mountPath: "/restore"
-      volumes:
-      - name: cfme-backup-vol
-        persistentVolumeClaim:
-          claimName: cloudforms-backup
-      - name: cfme-prod-vol
-        persistentVolumeClaim:
-          claimName: cloudforms-postgresql
-      restartPolicy: Never
diff --git a/roles/openshift_cfme/files/templates/cloudforms/cfme-scc-sysadmin.yaml b/roles/openshift_cfme/files/templates/cloudforms/cfme-scc-sysadmin.yaml
deleted file mode 100644
index d2ece9298..000000000
--- a/roles/openshift_cfme/files/templates/cloudforms/cfme-scc-sysadmin.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-allowHostDirVolumePlugin: false
-allowHostIPC: false
-allowHostNetwork: false
-allowHostPID: false
-allowHostPorts: false
-allowPrivilegedContainer: false
-allowedCapabilities:
-apiVersion: v1
-defaultAddCapabilities:
-- SYS_ADMIN
-fsGroup:
-  type: RunAsAny
-groups:
-- system:cluster-admins
-kind: SecurityContextConstraints
-metadata:
-  annotations:
-    kubernetes.io/description: cfme-sysadmin provides all features of the anyuid SCC but allows users to have SYS_ADMIN capabilities. This is the required scc for Pods requiring to run with systemd and the message bus.
-  creationTimestamp:
-  name: cfme-sysadmin
-priority: 10
-readOnlyRootFilesystem: false
-requiredDropCapabilities:
-- MKNOD
-- SYS_CHROOT
-runAsUser:
-  type: RunAsAny
-seLinuxContext:
-  type: MustRunAs
-supplementalGroups:
-  type: RunAsAny
-users:
-volumes:
-- configMap
-- downwardAPI
-- emptyDir
-- persistentVolumeClaim
-- secret
diff --git a/roles/openshift_cfme/files/templates/cloudforms/cfme-template-ext-db.yaml b/roles/openshift_cfme/files/templates/cloudforms/cfme-template-ext-db.yaml
deleted file mode 100644
index 4a04f3372..000000000
--- a/roles/openshift_cfme/files/templates/cloudforms/cfme-template-ext-db.yaml
+++ /dev/null
@@ -1,763 +0,0 @@
-apiVersion: v1
-kind: Template
-labels:
-  template: cloudforms-ext-db
-metadata:
-  name: cloudforms-ext-db
-  annotations:
-    description: CloudForms appliance with persistent storage using a external DB host
-    tags: instant-app,cloudforms,cfme
-    iconClass: icon-rails
-objects:
-- apiVersion: v1
-  kind: ServiceAccount
-  metadata:
-    name: cfme-orchestrator
-- apiVersion: v1
-  kind: ServiceAccount
-  metadata:
-    name: cfme-anyuid
-- apiVersion: v1
-  kind: ServiceAccount
-  metadata:
-    name: cfme-privileged
-- apiVersion: v1
-  kind: ServiceAccount
-  metadata:
-    name: cfme-httpd
-- apiVersion: v1
-  kind: Secret
-  metadata:
-    name: "${NAME}-secrets"
-  stringData:
-    pg-password: "${DATABASE_PASSWORD}"
-    database-url: postgresql://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_SERVICE_NAME}/${DATABASE_NAME}?encoding=utf8&pool=5&wait_timeout=5
-    v2-key: "${V2_KEY}"
-- apiVersion: v1
-  kind: Secret
-  metadata:
-    name: "${ANSIBLE_SERVICE_NAME}-secrets"
-  stringData:
-    rabbit-password: "${ANSIBLE_RABBITMQ_PASSWORD}"
-    secret-key: "${ANSIBLE_SECRET_KEY}"
-    admin-password: "${ANSIBLE_ADMIN_PASSWORD}"
-- apiVersion: v1
-  kind: Service
-  metadata:
-    annotations:
-      description: Exposes and load balances CloudForms pods
-      service.alpha.openshift.io/dependencies: '[{"name":"${DATABASE_SERVICE_NAME}","namespace":"","kind":"Service"},{"name":"${MEMCACHED_SERVICE_NAME}","namespace":"","kind":"Service"}]'
-    name: "${NAME}"
-  spec:
-    clusterIP: None
-    ports:
-    - name: http
-      port: 80
-      protocol: TCP
-      targetPort: 80
-    selector:
-      name: "${NAME}"
-- apiVersion: v1
-  kind: Route
-  metadata:
-    name: "${HTTPD_SERVICE_NAME}"
-  spec:
-    host: "${APPLICATION_DOMAIN}"
-    port:
-      targetPort: http
-    tls:
-      termination: edge
-      insecureEdgeTerminationPolicy: Redirect
-    to:
-      kind: Service
-      name: "${HTTPD_SERVICE_NAME}"
-- apiVersion: apps/v1beta1
-  kind: StatefulSet
-  metadata:
-    name: "${NAME}"
-    annotations:
-      description: Defines how to deploy the CloudForms appliance
-  spec:
-    serviceName: "${NAME}"
-    replicas: "${APPLICATION_REPLICA_COUNT}"
-    template:
-      metadata:
-        labels:
-          name: "${NAME}"
-        name: "${NAME}"
-      spec:
-        containers:
-        - name: cloudforms
-          image: "${FRONTEND_APPLICATION_IMG_NAME}:${FRONTEND_APPLICATION_IMG_TAG}"
-          livenessProbe:
-            tcpSocket:
-              port: 80
-            initialDelaySeconds: 480
-            timeoutSeconds: 3
-          readinessProbe:
-            httpGet:
-              path: "/"
-              port: 80
-              scheme: HTTP
-            initialDelaySeconds: 200
-            timeoutSeconds: 3
-          ports:
-          - containerPort: 80
-            protocol: TCP
-          volumeMounts:
-          - name: "${NAME}-server"
-            mountPath: "/persistent"
-          env:
-          - name: MY_POD_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
-          - name: APPLICATION_INIT_DELAY
-            value: "${APPLICATION_INIT_DELAY}"
-          - name: DATABASE_REGION
-            value: "${DATABASE_REGION}"
-          - name: DATABASE_URL
-            valueFrom:
-              secretKeyRef:
-                name: "${NAME}-secrets"
-                key: database-url
-          - name: V2_KEY
-            valueFrom:
-              secretKeyRef:
-                name: "${NAME}-secrets"
-                key: v2-key
-          - name: ANSIBLE_ADMIN_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: "${ANSIBLE_SERVICE_NAME}-secrets"
-                key: admin-password
-          resources:
-            requests:
-              memory: "${APPLICATION_MEM_REQ}"
-              cpu: "${APPLICATION_CPU_REQ}"
-            limits:
-              memory: "${APPLICATION_MEM_LIMIT}"
-          lifecycle:
-            preStop:
-              exec:
-                command:
-                - "/opt/rh/cfme-container-scripts/sync-pv-data"
-        serviceAccount: cfme-orchestrator
-        serviceAccountName: cfme-orchestrator
-        terminationGracePeriodSeconds: 90
-    volumeClaimTemplates:
-    - metadata:
-        name: "${NAME}-server"
-        annotations:
-      spec:
-        accessModes:
-        - ReadWriteOnce
-        resources:
-          requests:
-            storage: "${APPLICATION_VOLUME_CAPACITY}"
-- apiVersion: v1
-  kind: Service
-  metadata:
-    annotations:
-      description: Headless service for CloudForms backend pods
-    name: "${NAME}-backend"
-  spec:
-    clusterIP: None
-    selector:
-      name: "${NAME}-backend"
-- apiVersion: apps/v1beta1
-  kind: StatefulSet
-  metadata:
-    name: "${NAME}-backend"
-    annotations:
-      description: Defines how to deploy the CloudForms appliance
-  spec:
-    serviceName: "${NAME}-backend"
-    replicas: 0
-    template:
-      metadata:
-        labels:
-          name: "${NAME}-backend"
-        name: "${NAME}-backend"
-      spec:
-        containers:
-        - name: cloudforms
-          image: "${BACKEND_APPLICATION_IMG_NAME}:${BACKEND_APPLICATION_IMG_TAG}"
-          livenessProbe:
-            exec:
-              command:
-              - pidof
-              - MIQ Server
-            initialDelaySeconds: 480
-            timeoutSeconds: 3
-          volumeMounts:
-          - name: "${NAME}-server"
-            mountPath: "/persistent"
-          env:
-          - name: APPLICATION_INIT_DELAY
-            value: "${APPLICATION_INIT_DELAY}"
-          - name: DATABASE_URL
-            valueFrom:
-              secretKeyRef:
-                name: "${NAME}-secrets"
-                key: database-url
-          - name: MIQ_SERVER_DEFAULT_ROLES
-            value: database_operations,event,reporting,scheduler,smartstate,ems_operations,ems_inventory,automate
-          - name: FRONTEND_SERVICE_NAME
-            value: "${NAME}"
-          - name: V2_KEY
-            valueFrom:
-              secretKeyRef:
-                name: "${NAME}-secrets"
-                key: v2-key
-          - name: ANSIBLE_ADMIN_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: "${ANSIBLE_SERVICE_NAME}-secrets"
-                key: admin-password
-          resources:
-            requests:
-              memory: "${APPLICATION_MEM_REQ}"
-              cpu: "${APPLICATION_CPU_REQ}"
-            limits:
-              memory: "${APPLICATION_MEM_LIMIT}"
-          lifecycle:
-            preStop:
-              exec:
-                command:
-                - "/opt/rh/cfme-container-scripts/sync-pv-data"
-        serviceAccount: cfme-orchestrator
-        serviceAccountName: cfme-orchestrator
-        terminationGracePeriodSeconds: 90
-    volumeClaimTemplates:
-    - metadata:
-        name: "${NAME}-server"
-        annotations:
-      spec:
-        accessModes:
-        - ReadWriteOnce
-        resources:
-          requests:
-            storage: "${APPLICATION_VOLUME_CAPACITY}"
-- apiVersion: v1
-  kind: Service
-  metadata:
-    name: "${MEMCACHED_SERVICE_NAME}"
-    annotations:
-      description: Exposes the memcached server
-  spec:
-    ports:
-    - name: memcached
-      port: 11211
-      targetPort: 11211
-    selector:
-      name: "${MEMCACHED_SERVICE_NAME}"
-- apiVersion: v1
-  kind: DeploymentConfig
-  metadata:
-    name: "${MEMCACHED_SERVICE_NAME}"
-    annotations:
-      description: Defines how to deploy memcached
-  spec:
-    strategy:
-      type: Recreate
-    triggers:
-    - type: ConfigChange
-    replicas: 1
-    selector:
-      name: "${MEMCACHED_SERVICE_NAME}"
-    template:
-      metadata:
-        name: "${MEMCACHED_SERVICE_NAME}"
-        labels:
-          name: "${MEMCACHED_SERVICE_NAME}"
-      spec:
-        volumes: []
-        containers:
-        - name: memcached
-          image: "${MEMCACHED_IMG_NAME}:${MEMCACHED_IMG_TAG}"
-          ports:
-          - containerPort: 11211
-          readinessProbe:
-            timeoutSeconds: 1
-            initialDelaySeconds: 5
-            tcpSocket:
-              port: 11211
-          livenessProbe:
-            timeoutSeconds: 1
-            initialDelaySeconds: 30
-            tcpSocket:
-              port: 11211
-          volumeMounts: []
-          env:
-          - name: MEMCACHED_MAX_MEMORY
-            value: "${MEMCACHED_MAX_MEMORY}"
-          - name: MEMCACHED_MAX_CONNECTIONS
-            value: "${MEMCACHED_MAX_CONNECTIONS}"
-          - name: MEMCACHED_SLAB_PAGE_SIZE
-            value: "${MEMCACHED_SLAB_PAGE_SIZE}"
-          resources:
-            requests:
-              memory: "${MEMCACHED_MEM_REQ}"
-              cpu: "${MEMCACHED_CPU_REQ}"
-            limits:
-              memory: "${MEMCACHED_MEM_LIMIT}"
-- apiVersion: v1
-  kind: Service
-  metadata:
-    name: "${DATABASE_SERVICE_NAME}"
-    annotations:
-      description: Remote database service
-  spec:
-    ports:
-    - name: postgresql
-      port: 5432
-      targetPort: "${{DATABASE_PORT}}"
-    selector: {}
-- apiVersion: v1
-  kind: Endpoints
-  metadata:
-    name: "${DATABASE_SERVICE_NAME}"
-  subsets:
-  - addresses:
-    - ip: "${DATABASE_IP}"
-    ports:
-    - port: "${{DATABASE_PORT}}"
-      name: postgresql
-- apiVersion: v1
-  kind: Service
-  metadata:
-    annotations:
-      description: Exposes and load balances Ansible pods
-      service.alpha.openshift.io/dependencies: '[{"name":"${DATABASE_SERVICE_NAME}","namespace":"","kind":"Service"}]'
-    name: "${ANSIBLE_SERVICE_NAME}"
-  spec:
-    ports:
-    - name: http
-      port: 80
-      protocol: TCP
-      targetPort: 80
-    - name: https
-      port: 443
-      protocol: TCP
-      targetPort: 443
-    selector:
-      name: "${ANSIBLE_SERVICE_NAME}"
-- apiVersion: v1
-  kind: DeploymentConfig
-  metadata:
-    name: "${ANSIBLE_SERVICE_NAME}"
-    annotations:
-      description: Defines how to deploy the Ansible appliance
-  spec:
-    strategy:
-      type: Recreate
-    serviceName: "${ANSIBLE_SERVICE_NAME}"
-    replicas: 0
-    template:
-      metadata:
-        labels:
-          name: "${ANSIBLE_SERVICE_NAME}"
-        name: "${ANSIBLE_SERVICE_NAME}"
-      spec:
-        containers:
-        - name: ansible
-          image: "${ANSIBLE_IMG_NAME}:${ANSIBLE_IMG_TAG}"
-          livenessProbe:
-            tcpSocket:
-              port: 443
-            initialDelaySeconds: 480
-            timeoutSeconds: 3
-          readinessProbe:
-            httpGet:
-              path: "/"
-              port: 443
-              scheme: HTTPS
-            initialDelaySeconds: 200
-            timeoutSeconds: 3
-          ports:
-          - containerPort: 80
-            protocol: TCP
-          - containerPort: 443
-            protocol: TCP
-          securityContext:
-            privileged: true
-          env:
-          - name: ADMIN_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: "${ANSIBLE_SERVICE_NAME}-secrets"
-                key: admin-password
-          - name: RABBITMQ_USER_NAME
-            value: "${ANSIBLE_RABBITMQ_USER_NAME}"
-          - name: RABBITMQ_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: "${ANSIBLE_SERVICE_NAME}-secrets"
-                key: rabbit-password
-          - name: ANSIBLE_SECRET_KEY
-            valueFrom:
-              secretKeyRef:
-                name: "${ANSIBLE_SERVICE_NAME}-secrets"
-                key: secret-key
-          - name: DATABASE_SERVICE_NAME
-            value: "${DATABASE_SERVICE_NAME}"
-          - name: POSTGRESQL_USER
-            value: "${DATABASE_USER}"
-          - name: POSTGRESQL_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: "${NAME}-secrets"
-                key: pg-password
-          - name: POSTGRESQL_DATABASE
-            value: "${ANSIBLE_DATABASE_NAME}"
-          resources:
-            requests:
-              memory: "${ANSIBLE_MEM_REQ}"
-              cpu: "${ANSIBLE_CPU_REQ}"
-            limits:
-              memory: "${ANSIBLE_MEM_LIMIT}"
-        serviceAccount: cfme-privileged
-        serviceAccountName: cfme-privileged
-- apiVersion: v1
-  kind: ConfigMap
-  metadata:
-    name: "${HTTPD_SERVICE_NAME}-configs"
-  data:
-    application.conf: |
-      # Timeout: The number of seconds before receives and sends time out.
-      Timeout 120
-
-      RewriteEngine On
-      Options SymLinksIfOwnerMatch
-
-      <VirtualHost *:80>
-        KeepAlive on
-        ProxyPreserveHost on
-        ProxyPass        /ws/ ws://${NAME}/ws/
-        ProxyPassReverse /ws/ ws://${NAME}/ws/
-        ProxyPass        / http://${NAME}/
-        ProxyPassReverse / http://${NAME}/
-      </VirtualHost>
-- apiVersion: v1
-  kind: ConfigMap
-  metadata:
-    name: "${HTTPD_SERVICE_NAME}-auth-configs"
-  data:
-    auth-type: internal
-    auth-configuration.conf: |
-      # External Authentication Configuration File
-      #
-      # For details on usage please see https://github.com/ManageIQ/manageiq-pods/blob/master/README.md#configuring-external-authentication
-- apiVersion: v1
-  kind: Service
-  metadata:
-    name: "${HTTPD_SERVICE_NAME}"
-    annotations:
-      description: Exposes the httpd server
-      service.alpha.openshift.io/dependencies: '[{"name":"${NAME}","namespace":"","kind":"Service"}]'
-  spec:
-    ports:
-    - name: http
-      port: 80
-      targetPort: 80
-    selector:
-      name: httpd
-- apiVersion: v1
-  kind: DeploymentConfig
-  metadata:
-    name: "${HTTPD_SERVICE_NAME}"
-    annotations:
-      description: Defines how to deploy httpd
-  spec:
-    strategy:
-      type: Recreate
-      recreateParams:
-        timeoutSeconds: 1200
-    triggers:
-    - type: ConfigChange
-    replicas: 1
-    selector:
-      name: "${HTTPD_SERVICE_NAME}"
-    template:
-      metadata:
-        name: "${HTTPD_SERVICE_NAME}"
-        labels:
-          name: "${HTTPD_SERVICE_NAME}"
-      spec:
-        volumes:
-        - name: httpd-config
-          configMap:
-            name: "${HTTPD_SERVICE_NAME}-configs"
-        - name: httpd-auth-config
-          configMap:
-            name: "${HTTPD_SERVICE_NAME}-auth-configs"
-        containers:
-        - name: httpd
-          image: "${HTTPD_IMG_NAME}:${HTTPD_IMG_TAG}"
-          ports:
-          - containerPort: 80
-          livenessProbe:
-            exec:
-              command:
-              - pidof
-              - httpd
-            initialDelaySeconds: 15
-            timeoutSeconds: 3
-          readinessProbe:
-            tcpSocket:
-              port: 80
-            initialDelaySeconds: 10
-            timeoutSeconds: 3
-          volumeMounts:
-          - name: httpd-config
-            mountPath: "${HTTPD_CONFIG_DIR}"
-          - name: httpd-auth-config
-            mountPath: "${HTTPD_AUTH_CONFIG_DIR}"
-          resources:
-            requests:
-              memory: "${HTTPD_MEM_REQ}"
-              cpu: "${HTTPD_CPU_REQ}"
-            limits:
-              memory: "${HTTPD_MEM_LIMIT}"
-          env:
-          - name: HTTPD_AUTH_TYPE
-            valueFrom:
-              configMapKeyRef:
-                name: "${HTTPD_SERVICE_NAME}-auth-configs"
-                key: auth-type
-          lifecycle:
-            postStart:
-              exec:
-                command:
-                - "/usr/bin/save-container-environment"
-        serviceAccount: cfme-httpd
-        serviceAccountName: cfme-httpd
-parameters:
-- name: NAME
-  displayName: Name
-  required: true
-  description: The name assigned to all of the frontend objects defined in this template.
-  value: cloudforms
-- name: V2_KEY
-  displayName: CloudForms Encryption Key
-  required: true
-  description: Encryption Key for CloudForms Passwords
-  from: "[a-zA-Z0-9]{43}"
-  generate: expression
-- name: DATABASE_SERVICE_NAME
-  displayName: PostgreSQL Service Name
-  required: true
-  description: The name of the OpenShift Service exposed for the PostgreSQL container.
-  value: postgresql
-- name: DATABASE_USER
-  displayName: PostgreSQL User
-  required: true
-  description: PostgreSQL user that will access the database.
-  value: root
-- name: DATABASE_PASSWORD
-  displayName: PostgreSQL Password
-  required: true
-  description: Password for the PostgreSQL user.
-  from: "[a-zA-Z0-9]{8}"
-  generate: expression
-- name: DATABASE_IP
-  displayName: PostgreSQL Server IP
-  required: true
-  description: PostgreSQL external server IP used to configure service.
-  value: ''
-- name: DATABASE_PORT
-  displayName: PostgreSQL Server Port
-  required: true
-  description: PostgreSQL external server port used to configure service.
-  value: '5432'
-- name: DATABASE_NAME
-  required: true
-  displayName: PostgreSQL Database Name
-  description: Name of the PostgreSQL database accessed.
-  value: vmdb_production
-- name: DATABASE_REGION
-  required: true
-  displayName: Application Database Region
-  description: Database region that will be used for application.
-  value: '0'
-- name: ANSIBLE_DATABASE_NAME
-  displayName: Ansible PostgreSQL database name
-  required: true
-  description: The database to be used by the Ansible continer
-  value: awx
-- name: MEMCACHED_SERVICE_NAME
-  required: true
-  displayName: Memcached Service Name
-  description: The name of the OpenShift Service exposed for the Memcached container.
-  value: memcached
-- name: MEMCACHED_MAX_MEMORY
-  displayName: Memcached Max Memory
-  description: Memcached maximum memory for memcached object storage in MB.
-  value: '64'
-- name: MEMCACHED_MAX_CONNECTIONS
-  displayName: Memcached Max Connections
-  description: Memcached maximum number of connections allowed.
-  value: '1024'
-- name: MEMCACHED_SLAB_PAGE_SIZE
-  displayName: Memcached Slab Page Size
-  description: Memcached size of each slab page.
-  value: 1m
-- name: ANSIBLE_SERVICE_NAME
-  displayName: Ansible Service Name
-  description: The name of the OpenShift Service exposed for the Ansible container.
-  value: ansible
-- name: ANSIBLE_ADMIN_PASSWORD
-  displayName: Ansible admin User password
-  required: true
-  description: The password for the Ansible container admin user
-  from: "[a-zA-Z0-9]{32}"
-  generate: expression
-- name: ANSIBLE_SECRET_KEY
-  displayName: Ansible Secret Key
-  required: true
-  description: Encryption key for the Ansible container
-  from: "[a-f0-9]{32}"
-  generate: expression
-- name: ANSIBLE_RABBITMQ_USER_NAME
-  displayName: RabbitMQ Username
-  required: true
-  description: Username for the Ansible RabbitMQ Server
-  value: ansible
-- name: ANSIBLE_RABBITMQ_PASSWORD
-  displayName: RabbitMQ Server Password
-  required: true
-  description: Password for the Ansible RabbitMQ Server
-  from: "[a-zA-Z0-9]{32}"
-  generate: expression
-- name: APPLICATION_CPU_REQ
-  displayName: Application Min CPU Requested
-  required: true
-  description: Minimum amount of CPU time the Application container will need (expressed in millicores).
-  value: 1000m
-- name: MEMCACHED_CPU_REQ
-  displayName: Memcached Min CPU Requested
-  required: true
-  description: Minimum amount of CPU time the Memcached container will need (expressed in millicores).
-  value: 200m
-- name: ANSIBLE_CPU_REQ
-  displayName: Ansible Min CPU Requested
-  required: true
-  description: Minimum amount of CPU time the Ansible container will need (expressed in millicores).
-  value: 1000m
-- name: APPLICATION_MEM_REQ
-  displayName: Application Min RAM Requested
-  required: true
-  description: Minimum amount of memory the Application container will need.
-  value: 6144Mi
-- name: MEMCACHED_MEM_REQ
-  displayName: Memcached Min RAM Requested
-  required: true
-  description: Minimum amount of memory the Memcached container will need.
-  value: 64Mi
-- name: ANSIBLE_MEM_REQ
-  displayName: Ansible Min RAM Requested
-  required: true
-  description: Minimum amount of memory the Ansible container will need.
-  value: 2048Mi
-- name: APPLICATION_MEM_LIMIT
-  displayName: Application Max RAM Limit
-  required: true
-  description: Maximum amount of memory the Application container can consume.
-  value: 16384Mi
-- name: MEMCACHED_MEM_LIMIT
-  displayName: Memcached Max RAM Limit
-  required: true
-  description: Maximum amount of memory the Memcached container can consume.
-  value: 256Mi
-- name: ANSIBLE_MEM_LIMIT
-  displayName: Ansible Max RAM Limit
-  required: true
-  description: Maximum amount of memory the Ansible container can consume.
-  value: 8096Mi
-- name: MEMCACHED_IMG_NAME
-  displayName: Memcached Image Name
-  description: This is the Memcached image name requested to deploy.
-  value: brew-pulp-docker01.web.prod.ext.phx2.redhat.com:8888/cloudforms46/cfme-openshift-memcached
-- name: MEMCACHED_IMG_TAG
-  displayName: Memcached Image Tag
-  description: This is the Memcached image tag/version requested to deploy.
-  value: latest
-- name: FRONTEND_APPLICATION_IMG_NAME
-  displayName: Frontend Application Image Name
-  description: This is the Frontend Application image name requested to deploy.
-  value: brew-pulp-docker01.web.prod.ext.phx2.redhat.com:8888/cloudforms46/cfme-openshift-app-ui
-- name: BACKEND_APPLICATION_IMG_NAME
-  displayName: Backend Application Image Name
-  description: This is the Backend Application image name requested to deploy.
-  value: brew-pulp-docker01.web.prod.ext.phx2.redhat.com:8888/cloudforms46/cfme-openshift-app
-- name: FRONTEND_APPLICATION_IMG_TAG
-  displayName: Front end Application Image Tag
-  description: This is the CloudForms Frontend Application image tag/version requested to deploy.
-  value: latest
-- name: BACKEND_APPLICATION_IMG_TAG
-  displayName: Back end Application Image Tag
-  description: This is the CloudForms Backend Application image tag/version requested to deploy.
-  value: latest
-- name: ANSIBLE_IMG_NAME
-  displayName: Ansible Image Name
-  description: This is the Ansible image name requested to deploy.
-  value: brew-pulp-docker01.web.prod.ext.phx2.redhat.com:8888/cloudforms46/cfme-openshift-embedded-ansible
-- name: ANSIBLE_IMG_TAG
-  displayName: Ansible Image Tag
-  description: This is the Ansible image tag/version requested to deploy.
-  value: latest
-- name: APPLICATION_DOMAIN
-  displayName: Application Hostname
-  description: The exposed hostname that will route to the application service, if left blank a value will be defaulted.
-  value: ''
-- name: APPLICATION_REPLICA_COUNT
-  displayName: Application Replica Count
-  description: This is the number of Application replicas requested to deploy.
-  value: '1'
-- name: APPLICATION_INIT_DELAY
-  displayName: Application Init Delay
-  required: true
-  description: Delay in seconds before we attempt to initialize the application.
-  value: '15'
-- name: APPLICATION_VOLUME_CAPACITY
-  displayName: Application Volume Capacity
-  required: true
-  description: Volume space available for application data.
-  value: 5Gi
-- name: HTTPD_SERVICE_NAME
-  required: true
-  displayName: Apache httpd Service Name
-  description: The name of the OpenShift Service exposed for the httpd container.
-  value: httpd
-- name: HTTPD_IMG_NAME
-  displayName: Apache httpd Image Name
-  description: This is the httpd image name requested to deploy.
-  value: brew-pulp-docker01.web.prod.ext.phx2.redhat.com:8888/cloudforms46/cfme-openshift-httpd
-- name: HTTPD_IMG_TAG
-  displayName: Apache httpd Image Tag
-  description: This is the httpd image tag/version requested to deploy.
-  value: latest
-- name: HTTPD_CONFIG_DIR
-  displayName: Apache httpd Configuration Directory
-  description: Directory used to store the Apache configuration files.
-  value: "/etc/httpd/conf.d"
-- name: HTTPD_AUTH_CONFIG_DIR
-  displayName: External Authentication Configuration Directory
-  description: Directory used to store the external authentication configuration files.
-  value: "/etc/httpd/auth-conf.d"
-- name: HTTPD_CPU_REQ
-  displayName: Apache httpd Min CPU Requested
-  required: true
-  description: Minimum amount of CPU time the httpd container will need (expressed in millicores).
-  value: 500m
-- name: HTTPD_MEM_REQ
-  displayName: Apache httpd Min RAM Requested
-  required: true
-  description: Minimum amount of memory the httpd container will need.
-  value: 512Mi
-- name: HTTPD_MEM_LIMIT
-  displayName: Apache httpd Max RAM Limit
-  required: true
-  description: Maximum amount of memory the httpd container can consume.
-  value: 8192Mi
diff --git a/roles/openshift_cfme/files/templates/cloudforms/cfme-template.yaml b/roles/openshift_cfme/files/templates/cloudforms/cfme-template.yaml
deleted file mode 100644
index d7c9f5af7..000000000
--- a/roles/openshift_cfme/files/templates/cloudforms/cfme-template.yaml
+++ /dev/null
@@ -1,940 +0,0 @@
-apiVersion: v1
-kind: Template
-labels:
-  template: cloudforms
-metadata:
-  name: cloudforms
-  annotations:
-    description: CloudForms appliance with persistent storage
-    tags: instant-app,cloudforms,cfme
-    iconClass: icon-rails
-objects:
-- apiVersion: v1
-  kind: ServiceAccount
-  metadata:
-    name: cfme-orchestrator
-- apiVersion: v1
-  kind: ServiceAccount
-  metadata:
-    name: cfme-anyuid
-- apiVersion: v1
-  kind: ServiceAccount
-  metadata:
-    name: cfme-privileged
-- apiVersion: v1
-  kind: ServiceAccount
-  metadata:
-    name: cfme-httpd
-- apiVersion: v1
-  kind: Secret
-  metadata:
-    name: "${NAME}-secrets"
-  stringData:
-    pg-password: "${DATABASE_PASSWORD}"
-    database-url: postgresql://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_SERVICE_NAME}/${DATABASE_NAME}?encoding=utf8&pool=5&wait_timeout=5
-    v2-key: "${V2_KEY}"
-- apiVersion: v1
-  kind: Secret
-  metadata:
-    name: "${ANSIBLE_SERVICE_NAME}-secrets"
-  stringData:
-    rabbit-password: "${ANSIBLE_RABBITMQ_PASSWORD}"
-    secret-key: "${ANSIBLE_SECRET_KEY}"
-    admin-password: "${ANSIBLE_ADMIN_PASSWORD}"
-- apiVersion: v1
-  kind: ConfigMap
-  metadata:
-    name: "${DATABASE_SERVICE_NAME}-configs"
-  data:
-    01_miq_overrides.conf: |
-      #------------------------------------------------------------------------------
-      # CONNECTIONS AND AUTHENTICATION
-      #------------------------------------------------------------------------------
-
-      tcp_keepalives_count = 9
-      tcp_keepalives_idle = 3
-      tcp_keepalives_interval = 75
-
-      #------------------------------------------------------------------------------
-      # RESOURCE USAGE (except WAL)
-      #------------------------------------------------------------------------------
-
-      shared_preload_libraries = 'pglogical,repmgr_funcs'
-      max_worker_processes = 10
-
-      #------------------------------------------------------------------------------
-      # WRITE AHEAD LOG
-      #------------------------------------------------------------------------------
-
-      wal_level = 'logical'
-      wal_log_hints = on
-      wal_buffers = 16MB
-      checkpoint_completion_target = 0.9
-
-      #------------------------------------------------------------------------------
-      # REPLICATION
-      #------------------------------------------------------------------------------
-
-      max_wal_senders = 10
-      wal_sender_timeout = 0
-      max_replication_slots = 10
-      hot_standby = on
-
-      #------------------------------------------------------------------------------
-      # ERROR REPORTING AND LOGGING
-      #------------------------------------------------------------------------------
-
-      log_filename = 'postgresql.log'
-      log_rotation_age = 0
-      log_min_duration_statement = 5000
-      log_connections = on
-      log_disconnections = on
-      log_line_prefix = '%t:%r:%c:%u@%d:[%p]:'
-      log_lock_waits = on
-
-      #------------------------------------------------------------------------------
-      # AUTOVACUUM PARAMETERS
-      #------------------------------------------------------------------------------
-
-      log_autovacuum_min_duration = 0
-      autovacuum_naptime = 5min
-      autovacuum_vacuum_threshold = 500
-      autovacuum_analyze_threshold = 500
-      autovacuum_vacuum_scale_factor = 0.05
-
-      #------------------------------------------------------------------------------
-      # LOCK MANAGEMENT
-      #------------------------------------------------------------------------------
-
-      deadlock_timeout = 5s
-
-      #------------------------------------------------------------------------------
-      # VERSION/PLATFORM COMPATIBILITY
-      #------------------------------------------------------------------------------
-
-      escape_string_warning = off
-      standard_conforming_strings = off
-- apiVersion: v1
-  kind: ConfigMap
-  metadata:
-    name: "${HTTPD_SERVICE_NAME}-configs"
-  data:
-    application.conf: |
-      # Timeout: The number of seconds before receives and sends time out.
-      Timeout 120
-
-      RewriteEngine On
-      Options SymLinksIfOwnerMatch
-
-      <VirtualHost *:80>
-        KeepAlive on
-        ProxyPreserveHost on
-        ProxyPass        /ws/ ws://${NAME}/ws/
-        ProxyPassReverse /ws/ ws://${NAME}/ws/
-        ProxyPass        / http://${NAME}/
-        ProxyPassReverse / http://${NAME}/
-      </VirtualHost>
-- apiVersion: v1
-  kind: ConfigMap
-  metadata:
-    name: "${HTTPD_SERVICE_NAME}-auth-configs"
-  data:
-    auth-type: internal
-    auth-configuration.conf: |
-      # External Authentication Configuration File
-      #
-      # For details on usage please see https://github.com/ManageIQ/manageiq-pods/blob/master/README.md#configuring-external-authentication
-- apiVersion: v1
-  kind: Service
-  metadata:
-    annotations:
-      description: Exposes and load balances CloudForms pods
-      service.alpha.openshift.io/dependencies: '[{"name":"${DATABASE_SERVICE_NAME}","namespace":"","kind":"Service"},{"name":"${MEMCACHED_SERVICE_NAME}","namespace":"","kind":"Service"}]'
-    name: "${NAME}"
-  spec:
-    clusterIP: None
-    ports:
-    - name: http
-      port: 80
-      protocol: TCP
-      targetPort: 80
-    selector:
-      name: "${NAME}"
-- apiVersion: v1
-  kind: Route
-  metadata:
-    name: "${HTTPD_SERVICE_NAME}"
-  spec:
-    host: "${APPLICATION_DOMAIN}"
-    port:
-      targetPort: http
-    tls:
-      termination: edge
-      insecureEdgeTerminationPolicy: Redirect
-    to:
-      kind: Service
-      name: "${HTTPD_SERVICE_NAME}"
-- apiVersion: v1
-  kind: PersistentVolumeClaim
-  metadata:
-    name: "${NAME}-${DATABASE_SERVICE_NAME}"
-  spec:
-    accessModes:
-    - ReadWriteOnce
-    resources:
-      requests:
-        storage: "${DATABASE_VOLUME_CAPACITY}"
-- apiVersion: apps/v1beta1
-  kind: StatefulSet
-  metadata:
-    name: "${NAME}"
-    annotations:
-      description: Defines how to deploy the CloudForms appliance
-  spec:
-    serviceName: "${NAME}"
-    replicas: "${APPLICATION_REPLICA_COUNT}"
-    template:
-      metadata:
-        labels:
-          name: "${NAME}"
-        name: "${NAME}"
-      spec:
-        containers:
-        - name: cloudforms
-          image: "${FRONTEND_APPLICATION_IMG_NAME}:${FRONTEND_APPLICATION_IMG_TAG}"
-          livenessProbe:
-            tcpSocket:
-              port: 80
-            initialDelaySeconds: 480
-            timeoutSeconds: 3
-          readinessProbe:
-            httpGet:
-              path: "/"
-              port: 80
-              scheme: HTTP
-            initialDelaySeconds: 200
-            timeoutSeconds: 3
-          ports:
-          - containerPort: 80
-            protocol: TCP
-          volumeMounts:
-          - name: "${NAME}-server"
-            mountPath: "/persistent"
-          env:
-          - name: MY_POD_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
-          - name: APPLICATION_INIT_DELAY
-            value: "${APPLICATION_INIT_DELAY}"
-          - name: DATABASE_REGION
-            value: "${DATABASE_REGION}"
-          - name: DATABASE_URL
-            valueFrom:
-              secretKeyRef:
-                name: "${NAME}-secrets"
-                key: database-url
-          - name: V2_KEY
-            valueFrom:
-              secretKeyRef:
-                name: "${NAME}-secrets"
-                key: v2-key
-          - name: ANSIBLE_ADMIN_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: "${ANSIBLE_SERVICE_NAME}-secrets"
-                key: admin-password
-          resources:
-            requests:
-              memory: "${APPLICATION_MEM_REQ}"
-              cpu: "${APPLICATION_CPU_REQ}"
-            limits:
-              memory: "${APPLICATION_MEM_LIMIT}"
-          lifecycle:
-            preStop:
-              exec:
-                command:
-                - "/opt/rh/cfme-container-scripts/sync-pv-data"
-        serviceAccount: cfme-orchestrator
-        serviceAccountName: cfme-orchestrator
-        terminationGracePeriodSeconds: 90
-    volumeClaimTemplates:
-    - metadata:
-        name: "${NAME}-server"
-        annotations:
-      spec:
-        accessModes:
-        - ReadWriteOnce
-        resources:
-          requests:
-            storage: "${APPLICATION_VOLUME_CAPACITY}"
-- apiVersion: v1
-  kind: Service
-  metadata:
-    annotations:
-      description: Headless service for CloudForms backend pods
-    name: "${NAME}-backend"
-  spec:
-    clusterIP: None
-    selector:
-      name: "${NAME}-backend"
-- apiVersion: apps/v1beta1
-  kind: StatefulSet
-  metadata:
-    name: "${NAME}-backend"
-    annotations:
-      description: Defines how to deploy the CloudForms appliance
-  spec:
-    serviceName: "${NAME}-backend"
-    replicas: 0
-    template:
-      metadata:
-        labels:
-          name: "${NAME}-backend"
-        name: "${NAME}-backend"
-      spec:
-        containers:
-        - name: cloudforms
-          image: "${BACKEND_APPLICATION_IMG_NAME}:${BACKEND_APPLICATION_IMG_TAG}"
-          livenessProbe:
-            exec:
-              command:
-              - pidof
-              - MIQ Server
-            initialDelaySeconds: 480
-            timeoutSeconds: 3
-          volumeMounts:
-          - name: "${NAME}-server"
-            mountPath: "/persistent"
-          env:
-          - name: APPLICATION_INIT_DELAY
-            value: "${APPLICATION_INIT_DELAY}"
-          - name: DATABASE_URL
-            valueFrom:
-              secretKeyRef:
-                name: "${NAME}-secrets"
-                key: database-url
-          - name: MIQ_SERVER_DEFAULT_ROLES
-            value: database_operations,event,reporting,scheduler,smartstate,ems_operations,ems_inventory,automate
-          - name: FRONTEND_SERVICE_NAME
-            value: "${NAME}"
-          - name: V2_KEY
-            valueFrom:
-              secretKeyRef:
-                name: "${NAME}-secrets"
-                key: v2-key
-          - name: ANSIBLE_ADMIN_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: "${ANSIBLE_SERVICE_NAME}-secrets"
-                key: admin-password
-          resources:
-            requests:
-              memory: "${APPLICATION_MEM_REQ}"
-              cpu: "${APPLICATION_CPU_REQ}"
-            limits:
-              memory: "${APPLICATION_MEM_LIMIT}"
-          lifecycle:
-            preStop:
-              exec:
-                command:
-                - "/opt/rh/cfme-container-scripts/sync-pv-data"
-        serviceAccount: cfme-orchestrator
-        serviceAccountName: cfme-orchestrator
-        terminationGracePeriodSeconds: 90
-    volumeClaimTemplates:
-    - metadata:
-        name: "${NAME}-server"
-        annotations:
-      spec:
-        accessModes:
-        - ReadWriteOnce
-        resources:
-          requests:
-            storage: "${APPLICATION_VOLUME_CAPACITY}"
-- apiVersion: v1
-  kind: Service
-  metadata:
-    name: "${MEMCACHED_SERVICE_NAME}"
-    annotations:
-      description: Exposes the memcached server
-  spec:
-    ports:
-    - name: memcached
-      port: 11211
-      targetPort: 11211
-    selector:
-      name: "${MEMCACHED_SERVICE_NAME}"
-- apiVersion: v1
-  kind: DeploymentConfig
-  metadata:
-    name: "${MEMCACHED_SERVICE_NAME}"
-    annotations:
-      description: Defines how to deploy memcached
-  spec:
-    strategy:
-      type: Recreate
-    triggers:
-    - type: ConfigChange
-    replicas: 1
-    selector:
-      name: "${MEMCACHED_SERVICE_NAME}"
-    template:
-      metadata:
-        name: "${MEMCACHED_SERVICE_NAME}"
-        labels:
-          name: "${MEMCACHED_SERVICE_NAME}"
-      spec:
-        volumes: []
-        containers:
-        - name: memcached
-          image: "${MEMCACHED_IMG_NAME}:${MEMCACHED_IMG_TAG}"
-          ports:
-          - containerPort: 11211
-          readinessProbe:
-            timeoutSeconds: 1
-            initialDelaySeconds: 5
-            tcpSocket:
-              port: 11211
-          livenessProbe:
-            timeoutSeconds: 1
-            initialDelaySeconds: 30
-            tcpSocket:
-              port: 11211
-          volumeMounts: []
-          env:
-          - name: MEMCACHED_MAX_MEMORY
-            value: "${MEMCACHED_MAX_MEMORY}"
-          - name: MEMCACHED_MAX_CONNECTIONS
-            value: "${MEMCACHED_MAX_CONNECTIONS}"
-          - name: MEMCACHED_SLAB_PAGE_SIZE
-            value: "${MEMCACHED_SLAB_PAGE_SIZE}"
-          resources:
-            requests:
-              memory: "${MEMCACHED_MEM_REQ}"
-              cpu: "${MEMCACHED_CPU_REQ}"
-            limits:
-              memory: "${MEMCACHED_MEM_LIMIT}"
-- apiVersion: v1
-  kind: Service
-  metadata:
-    name: "${DATABASE_SERVICE_NAME}"
-    annotations:
-      description: Exposes the database server
-  spec:
-    ports:
-    - name: postgresql
-      port: 5432
-      targetPort: 5432
-    selector:
-      name: "${DATABASE_SERVICE_NAME}"
-- apiVersion: v1
-  kind: DeploymentConfig
-  metadata:
-    name: "${DATABASE_SERVICE_NAME}"
-    annotations:
-      description: Defines how to deploy the database
-  spec:
-    strategy:
-      type: Recreate
-    triggers:
-    - type: ConfigChange
-    replicas: 1
-    selector:
-      name: "${DATABASE_SERVICE_NAME}"
-    template:
-      metadata:
-        name: "${DATABASE_SERVICE_NAME}"
-        labels:
-          name: "${DATABASE_SERVICE_NAME}"
-      spec:
-        volumes:
-        - name: cfme-pgdb-volume
-          persistentVolumeClaim:
-            claimName: "${NAME}-${DATABASE_SERVICE_NAME}"
-        - name: cfme-pg-configs
-          configMap:
-            name: "${DATABASE_SERVICE_NAME}-configs"
-        containers:
-        - name: postgresql
-          image: "${POSTGRESQL_IMG_NAME}:${POSTGRESQL_IMG_TAG}"
-          ports:
-          - containerPort: 5432
-          readinessProbe:
-            timeoutSeconds: 1
-            initialDelaySeconds: 15
-            exec:
-              command:
-              - "/bin/sh"
-              - "-i"
-              - "-c"
-              - psql -h 127.0.0.1 -U ${POSTGRESQL_USER} -q -d ${POSTGRESQL_DATABASE} -c 'SELECT 1'
-          livenessProbe:
-            timeoutSeconds: 1
-            initialDelaySeconds: 60
-            tcpSocket:
-              port: 5432
-          volumeMounts:
-          - name: cfme-pgdb-volume
-            mountPath: "/var/lib/pgsql/data"
-          - name: cfme-pg-configs
-            mountPath: "${POSTGRESQL_CONFIG_DIR}"
-          env:
-          - name: POSTGRESQL_USER
-            value: "${DATABASE_USER}"
-          - name: POSTGRESQL_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: "${NAME}-secrets"
-                key: pg-password
-          - name: POSTGRESQL_DATABASE
-            value: "${DATABASE_NAME}"
-          - name: POSTGRESQL_MAX_CONNECTIONS
-            value: "${POSTGRESQL_MAX_CONNECTIONS}"
-          - name: POSTGRESQL_SHARED_BUFFERS
-            value: "${POSTGRESQL_SHARED_BUFFERS}"
-          - name: POSTGRESQL_CONFIG_DIR
-            value: "${POSTGRESQL_CONFIG_DIR}"
-          resources:
-            requests:
-              memory: "${POSTGRESQL_MEM_REQ}"
-              cpu: "${POSTGRESQL_CPU_REQ}"
-            limits:
-              memory: "${POSTGRESQL_MEM_LIMIT}"
-- apiVersion: v1
-  kind: Service
-  metadata:
-    annotations:
-      description: Exposes and load balances Ansible pods
-      service.alpha.openshift.io/dependencies: '[{"name":"${DATABASE_SERVICE_NAME}","namespace":"","kind":"Service"}]'
-    name: "${ANSIBLE_SERVICE_NAME}"
-  spec:
-    ports:
-    - name: http
-      port: 80
-      protocol: TCP
-      targetPort: 80
-    - name: https
-      port: 443
-      protocol: TCP
-      targetPort: 443
-    selector:
-      name: "${ANSIBLE_SERVICE_NAME}"
-- apiVersion: v1
-  kind: DeploymentConfig
-  metadata:
-    name: "${ANSIBLE_SERVICE_NAME}"
-    annotations:
-      description: Defines how to deploy the Ansible appliance
-  spec:
-    strategy:
-      type: Recreate
-    serviceName: "${ANSIBLE_SERVICE_NAME}"
-    replicas: 0
-    template:
-      metadata:
-        labels:
-          name: "${ANSIBLE_SERVICE_NAME}"
-        name: "${ANSIBLE_SERVICE_NAME}"
-      spec:
-        containers:
-        - name: ansible
-          image: "${ANSIBLE_IMG_NAME}:${ANSIBLE_IMG_TAG}"
-          livenessProbe:
-            tcpSocket:
-              port: 443
-            initialDelaySeconds: 480
-            timeoutSeconds: 3
-          readinessProbe:
-            httpGet:
-              path: "/"
-              port: 443
-              scheme: HTTPS
-            initialDelaySeconds: 200
-            timeoutSeconds: 3
-          ports:
-          - containerPort: 80
-            protocol: TCP
-          - containerPort: 443
-            protocol: TCP
-          securityContext:
-            privileged: true
-          env:
-          - name: ADMIN_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: "${ANSIBLE_SERVICE_NAME}-secrets"
-                key: admin-password
-          - name: RABBITMQ_USER_NAME
-            value: "${ANSIBLE_RABBITMQ_USER_NAME}"
-          - name: RABBITMQ_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: "${ANSIBLE_SERVICE_NAME}-secrets"
-                key: rabbit-password
-          - name: ANSIBLE_SECRET_KEY
-            valueFrom:
-              secretKeyRef:
-                name: "${ANSIBLE_SERVICE_NAME}-secrets"
-                key: secret-key
-          - name: DATABASE_SERVICE_NAME
-            value: "${DATABASE_SERVICE_NAME}"
-          - name: POSTGRESQL_USER
-            value: "${DATABASE_USER}"
-          - name: POSTGRESQL_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: "${NAME}-secrets"
-                key: pg-password
-          - name: POSTGRESQL_DATABASE
-            value: "${ANSIBLE_DATABASE_NAME}"
-          resources:
-            requests:
-              memory: "${ANSIBLE_MEM_REQ}"
-              cpu: "${ANSIBLE_CPU_REQ}"
-            limits:
-              memory: "${ANSIBLE_MEM_LIMIT}"
-        serviceAccount: cfme-privileged
-        serviceAccountName: cfme-privileged
-- apiVersion: v1
-  kind: Service
-  metadata:
-    name: "${HTTPD_SERVICE_NAME}"
-    annotations:
-      description: Exposes the httpd server
-      service.alpha.openshift.io/dependencies: '[{"name":"${NAME}","namespace":"","kind":"Service"}]'
-  spec:
-    ports:
-    - name: http
-      port: 80
-      targetPort: 80
-    selector:
-      name: httpd
-- apiVersion: v1
-  kind: DeploymentConfig
-  metadata:
-    name: "${HTTPD_SERVICE_NAME}"
-    annotations:
-      description: Defines how to deploy httpd
-  spec:
-    strategy:
-      type: Recreate
-      recreateParams:
-        timeoutSeconds: 1200
-    triggers:
-    - type: ConfigChange
-    replicas: 1
-    selector:
-      name: "${HTTPD_SERVICE_NAME}"
-    template:
-      metadata:
-        name: "${HTTPD_SERVICE_NAME}"
-        labels:
-          name: "${HTTPD_SERVICE_NAME}"
-      spec:
-        volumes:
-        - name: httpd-config
-          configMap:
-            name: "${HTTPD_SERVICE_NAME}-configs"
-        - name: httpd-auth-config
-          configMap:
-            name: "${HTTPD_SERVICE_NAME}-auth-configs"
-        containers:
-        - name: httpd
-          image: "${HTTPD_IMG_NAME}:${HTTPD_IMG_TAG}"
-          ports:
-          - containerPort: 80
-          livenessProbe:
-            exec:
-              command:
-              - pidof
-              - httpd
-            initialDelaySeconds: 15
-            timeoutSeconds: 3
-          readinessProbe:
-            tcpSocket:
-              port: 80
-            initialDelaySeconds: 10
-            timeoutSeconds: 3
-          volumeMounts:
-          - name: httpd-config
-            mountPath: "${HTTPD_CONFIG_DIR}"
-          - name: httpd-auth-config
-            mountPath: "${HTTPD_AUTH_CONFIG_DIR}"
-          resources:
-            requests:
-              memory: "${HTTPD_MEM_REQ}"
-              cpu: "${HTTPD_CPU_REQ}"
-            limits:
-              memory: "${HTTPD_MEM_LIMIT}"
-          env:
-          - name: HTTPD_AUTH_TYPE
-            valueFrom:
-              configMapKeyRef:
-                name: "${HTTPD_SERVICE_NAME}-auth-configs"
-                key: auth-type
-          lifecycle:
-            postStart:
-              exec:
-                command:
-                - "/usr/bin/save-container-environment"
-        serviceAccount: cfme-httpd
-        serviceAccountName: cfme-httpd
-parameters:
-- name: NAME
-  displayName: Name
-  required: true
-  description: The name assigned to all of the frontend objects defined in this template.
-  value: cloudforms
-- name: V2_KEY
-  displayName: CloudForms Encryption Key
-  required: true
-  description: Encryption Key for CloudForms Passwords
-  from: "[a-zA-Z0-9]{43}"
-  generate: expression
-- name: DATABASE_SERVICE_NAME
-  displayName: PostgreSQL Service Name
-  required: true
-  description: The name of the OpenShift Service exposed for the PostgreSQL container.
-  value: postgresql
-- name: DATABASE_USER
-  displayName: PostgreSQL User
-  required: true
-  description: PostgreSQL user that will access the database.
-  value: root
-- name: DATABASE_PASSWORD
-  displayName: PostgreSQL Password
-  required: true
-  description: Password for the PostgreSQL user.
-  from: "[a-zA-Z0-9]{8}"
-  generate: expression
-- name: DATABASE_NAME
-  required: true
-  displayName: PostgreSQL Database Name
-  description: Name of the PostgreSQL database accessed.
-  value: vmdb_production
-- name: DATABASE_REGION
-  required: true
-  displayName: Application Database Region
-  description: Database region that will be used for application.
-  value: '0'
-- name: ANSIBLE_DATABASE_NAME
-  displayName: Ansible PostgreSQL database name
-  required: true
-  description: The database to be used by the Ansible continer
-  value: awx
-- name: MEMCACHED_SERVICE_NAME
-  required: true
-  displayName: Memcached Service Name
-  description: The name of the OpenShift Service exposed for the Memcached container.
-  value: memcached
-- name: MEMCACHED_MAX_MEMORY
-  displayName: Memcached Max Memory
-  description: Memcached maximum memory for memcached object storage in MB.
-  value: '64'
-- name: MEMCACHED_MAX_CONNECTIONS
-  displayName: Memcached Max Connections
-  description: Memcached maximum number of connections allowed.
-  value: '1024'
-- name: MEMCACHED_SLAB_PAGE_SIZE
-  displayName: Memcached Slab Page Size
-  description: Memcached size of each slab page.
-  value: 1m
-- name: POSTGRESQL_CONFIG_DIR
-  displayName: PostgreSQL Configuration Overrides
-  description: Directory used to store PostgreSQL configuration overrides.
-  value: "/var/lib/pgsql/conf.d"
-- name: POSTGRESQL_MAX_CONNECTIONS
-  displayName: PostgreSQL Max Connections
-  description: PostgreSQL maximum number of database connections allowed.
-  value: '1000'
-- name: POSTGRESQL_SHARED_BUFFERS
-  displayName: PostgreSQL Shared Buffer Amount
-  description: Amount of memory dedicated for PostgreSQL shared memory buffers.
-  value: 1GB
-- name: ANSIBLE_SERVICE_NAME
-  displayName: Ansible Service Name
-  description: The name of the OpenShift Service exposed for the Ansible container.
-  value: ansible
-- name: ANSIBLE_ADMIN_PASSWORD
-  displayName: Ansible admin User password
-  required: true
-  description: The password for the Ansible container admin user
-  from: "[a-zA-Z0-9]{32}"
-  generate: expression
-- name: ANSIBLE_SECRET_KEY
-  displayName: Ansible Secret Key
-  required: true
-  description: Encryption key for the Ansible container
-  from: "[a-f0-9]{32}"
-  generate: expression
-- name: ANSIBLE_RABBITMQ_USER_NAME
-  displayName: RabbitMQ Username
-  required: true
-  description: Username for the Ansible RabbitMQ Server
-  value: ansible
-- name: ANSIBLE_RABBITMQ_PASSWORD
-  displayName: RabbitMQ Server Password
-  required: true
-  description: Password for the Ansible RabbitMQ Server
-  from: "[a-zA-Z0-9]{32}"
-  generate: expression
-- name: APPLICATION_CPU_REQ
-  displayName: Application Min CPU Requested
-  required: true
-  description: Minimum amount of CPU time the Application container will need (expressed in millicores).
-  value: 1000m
-- name: POSTGRESQL_CPU_REQ
-  displayName: PostgreSQL Min CPU Requested
-  required: true
-  description: Minimum amount of CPU time the PostgreSQL container will need (expressed in millicores).
-  value: 500m
-- name: MEMCACHED_CPU_REQ
-  displayName: Memcached Min CPU Requested
-  required: true
-  description: Minimum amount of CPU time the Memcached container will need (expressed in millicores).
-  value: 200m
-- name: ANSIBLE_CPU_REQ
-  displayName: Ansible Min CPU Requested
-  required: true
-  description: Minimum amount of CPU time the Ansible container will need (expressed in millicores).
-  value: 1000m
-- name: APPLICATION_MEM_REQ
-  displayName: Application Min RAM Requested
-  required: true
-  description: Minimum amount of memory the Application container will need.
-  value: 6144Mi
-- name: POSTGRESQL_MEM_REQ
-  displayName: PostgreSQL Min RAM Requested
-  required: true
-  description: Minimum amount of memory the PostgreSQL container will need.
-  value: 4Gi
-- name: MEMCACHED_MEM_REQ
-  displayName: Memcached Min RAM Requested
-  required: true
-  description: Minimum amount of memory the Memcached container will need.
-  value: 64Mi
-- name: ANSIBLE_MEM_REQ
-  displayName: Ansible Min RAM Requested
-  required: true
-  description: Minimum amount of memory the Ansible container will need.
-  value: 2048Mi
-- name: APPLICATION_MEM_LIMIT
-  displayName: Application Max RAM Limit
-  required: true
-  description: Maximum amount of memory the Application container can consume.
-  value: 16384Mi
-- name: POSTGRESQL_MEM_LIMIT
-  displayName: PostgreSQL Max RAM Limit
-  required: true
-  description: Maximum amount of memory the PostgreSQL container can consume.
-  value: 8Gi
-- name: MEMCACHED_MEM_LIMIT
-  displayName: Memcached Max RAM Limit
-  required: true
-  description: Maximum amount of memory the Memcached container can consume.
-  value: 256Mi
-- name: ANSIBLE_MEM_LIMIT
-  displayName: Ansible Max RAM Limit
-  required: true
-  description: Maximum amount of memory the Ansible container can consume.
-  value: 8096Mi
-- name: POSTGRESQL_IMG_NAME
-  displayName: PostgreSQL Image Name
-  description: This is the PostgreSQL image name requested to deploy.
-  value: brew-pulp-docker01.web.prod.ext.phx2.redhat.com:8888/cloudforms46/cfme-openshift-postgresql
-- name: POSTGRESQL_IMG_TAG
-  displayName: PostgreSQL Image Tag
-  description: This is the PostgreSQL image tag/version requested to deploy.
-  value: latest
-- name: MEMCACHED_IMG_NAME
-  displayName: Memcached Image Name
-  description: This is the Memcached image name requested to deploy.
-  value: brew-pulp-docker01.web.prod.ext.phx2.redhat.com:8888/cloudforms46/cfme-openshift-memcached
-- name: MEMCACHED_IMG_TAG
-  displayName: Memcached Image Tag
-  description: This is the Memcached image tag/version requested to deploy.
-  value: latest
-- name: FRONTEND_APPLICATION_IMG_NAME
-  displayName: Frontend Application Image Name
-  description: This is the Frontend Application image name requested to deploy.
-  value: brew-pulp-docker01.web.prod.ext.phx2.redhat.com:8888/cloudforms46/cfme-openshift-app-ui
-- name: BACKEND_APPLICATION_IMG_NAME
-  displayName: Backend Application Image Name
-  description: This is the Backend Application image name requested to deploy.
-  value: brew-pulp-docker01.web.prod.ext.phx2.redhat.com:8888/cloudforms46/cfme-openshift-app
-- name: FRONTEND_APPLICATION_IMG_TAG
-  displayName: Front end Application Image Tag
-  description: This is the CloudForms Frontend Application image tag/version requested to deploy.
-  value: latest
-- name: BACKEND_APPLICATION_IMG_TAG
-  displayName: Back end Application Image Tag
-  description: This is the CloudForms Backend Application image tag/version requested to deploy.
-  value: latest
-- name: ANSIBLE_IMG_NAME
-  displayName: Ansible Image Name
-  description: This is the Ansible image name requested to deploy.
-  value: brew-pulp-docker01.web.prod.ext.phx2.redhat.com:8888/cloudforms46/cfme-openshift-embedded-ansible
-- name: ANSIBLE_IMG_TAG
-  displayName: Ansible Image Tag
-  description: This is the Ansible image tag/version requested to deploy.
-  value: latest
-- name: APPLICATION_DOMAIN
-  displayName: Application Hostname
-  description: The exposed hostname that will route to the application service, if left blank a value will be defaulted.
-  value: ''
-- name: APPLICATION_REPLICA_COUNT
-  displayName: Application Replica Count
-  description: This is the number of Application replicas requested to deploy.
-  value: '1'
-- name: APPLICATION_INIT_DELAY
-  displayName: Application Init Delay
-  required: true
-  description: Delay in seconds before we attempt to initialize the application.
-  value: '15'
-- name: APPLICATION_VOLUME_CAPACITY
-  displayName: Application Volume Capacity
-  required: true
-  description: Volume space available for application data.
-  value: 5Gi
-- name: DATABASE_VOLUME_CAPACITY
-  displayName: Database Volume Capacity
-  required: true
-  description: Volume space available for database.
-  value: 15Gi
-- name: HTTPD_SERVICE_NAME
-  required: true
-  displayName: Apache httpd Service Name
-  description: The name of the OpenShift Service exposed for the httpd container.
-  value: httpd
-- name: HTTPD_IMG_NAME
-  displayName: Apache httpd Image Name
-  description: This is the httpd image name requested to deploy.
-  value: brew-pulp-docker01.web.prod.ext.phx2.redhat.com:8888/cloudforms46/cfme-openshift-httpd
-- name: HTTPD_IMG_TAG
-  displayName: Apache httpd Image Tag
-  description: This is the httpd image tag/version requested to deploy.
-  value: latest
-- name: HTTPD_CONFIG_DIR
-  displayName: Apache Configuration Directory
-  description: Directory used to store the Apache configuration files.
-  value: "/etc/httpd/conf.d"
-- name: HTTPD_AUTH_CONFIG_DIR
-  displayName: External Authentication Configuration Directory
-  description: Directory used to store the external authentication configuration files.
-  value: "/etc/httpd/auth-conf.d"
-- name: HTTPD_CPU_REQ
-  displayName: Apache httpd Min CPU Requested
-  required: true
-  description: Minimum amount of CPU time the httpd container will need (expressed in millicores).
-  value: 500m
-- name: HTTPD_MEM_REQ
-  displayName: Apache httpd Min RAM Requested
-  required: true
-  description: Minimum amount of memory the httpd container will need.
-  value: 512Mi
-- name: HTTPD_MEM_LIMIT
-  displayName: Apache httpd Max RAM Limit
-  required: true
-  description: Maximum amount of memory the httpd container can consume.
-  value: 8192Mi
diff --git a/roles/openshift_cfme/files/templates/manageiq/miq-backup-job.yaml b/roles/openshift_cfme/files/templates/manageiq/miq-backup-job.yaml
deleted file mode 100644
index 044cb73a5..000000000
--- a/roles/openshift_cfme/files/templates/manageiq/miq-backup-job.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: manageiq-backup
-spec:
-  template:
-    metadata:
-      name: manageiq-backup
-    spec:
-      containers:
-      - name: postgresql
-        image: docker.io/manageiq/postgresql:latest
-        command:
-        - "/opt/manageiq/container-scripts/backup_db"
-        env:
-        - name: DATABASE_URL
-          valueFrom:
-            secretKeyRef:
-              name: manageiq-secrets
-              key: database-url
-        volumeMounts:
-        - name: miq-backup-vol
-          mountPath: "/backups"
-      volumes:
-      - name: miq-backup-vol
-        persistentVolumeClaim:
-          claimName: manageiq-backup
-      restartPolicy: Never
diff --git a/roles/openshift_cfme/files/templates/manageiq/miq-backup-pvc.yaml b/roles/openshift_cfme/files/templates/manageiq/miq-backup-pvc.yaml
deleted file mode 100644
index 25696ef23..000000000
--- a/roles/openshift_cfme/files/templates/manageiq/miq-backup-pvc.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: manageiq-backup
-spec:
-  accessModes:
-  - ReadWriteOnce
-  resources:
-    requests:
-      storage: 15Gi
diff --git a/roles/openshift_cfme/files/templates/manageiq/miq-pv-backup-example.yaml b/roles/openshift_cfme/files/templates/manageiq/miq-pv-backup-example.yaml
deleted file mode 100644
index a5cf54d4e..000000000
--- a/roles/openshift_cfme/files/templates/manageiq/miq-pv-backup-example.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: miq-pv03
-spec:
-  capacity:
-    storage: 15Gi
-  accessModes:
-  - ReadWriteOnce
-  nfs:
-    path: "/exports/miq-pv03"
-    server: "<your-nfs-host-here>"
-  persistentVolumeReclaimPolicy: Retain
diff --git a/roles/openshift_cfme/files/templates/manageiq/miq-pv-db-example.yaml b/roles/openshift_cfme/files/templates/manageiq/miq-pv-db-example.yaml
deleted file mode 100644
index a803bebe2..000000000
--- a/roles/openshift_cfme/files/templates/manageiq/miq-pv-db-example.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-apiVersion: v1
-kind: Template
-labels:
-  template: manageiq-db-pv
-metadata:
-  name: manageiq-db-pv
-  annotations:
-    description: PV Template for MIQ PostgreSQL DB
-    tags: PVS, MIQ
-objects:
-- apiVersion: v1
-  kind: PersistentVolume
-  metadata:
-    name: miq-db
-  spec:
-    capacity:
-      storage: "${PV_SIZE}"
-    accessModes:
-    - ReadWriteOnce
-    nfs:
-      path: "${BASE_PATH}/miq-db"
-      server: "${NFS_HOST}"
-    persistentVolumeReclaimPolicy: Retain
-parameters:
-- name: PV_SIZE
-  displayName: PV Size for DB
-  required: true
-  description: The size of the MIQ DB PV given in Gi
-  value: 15Gi
-- name: BASE_PATH
-  displayName: Exports Directory Base Path
-  required: true
-  description: The parent directory of your NFS exports
-  value: "/exports"
-- name: NFS_HOST
-  displayName: NFS Server Hostname
-  required: true
-  description: The hostname or IP address of the NFS server
diff --git a/roles/openshift_cfme/files/templates/manageiq/miq-pv-server-example.yaml b/roles/openshift_cfme/files/templates/manageiq/miq-pv-server-example.yaml
deleted file mode 100644
index 1288544d1..000000000
--- a/roles/openshift_cfme/files/templates/manageiq/miq-pv-server-example.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-apiVersion: v1
-kind: Template
-labels:
-  template: manageiq-app-pv
-metadata:
-  name: manageiq-app-pv
-  annotations:
-    description: PV Template for MIQ Server
-    tags: PVS, MIQ
-objects:
-- apiVersion: v1
-  kind: PersistentVolume
-  metadata:
-    name: miq-app
-  spec:
-    capacity:
-      storage: "${PV_SIZE}"
-    accessModes:
-    - ReadWriteOnce
-    nfs:
-      path: "${BASE_PATH}/miq-app"
-      server: "${NFS_HOST}"
-    persistentVolumeReclaimPolicy: Retain
-parameters:
-- name: PV_SIZE
-  displayName: PV Size for App
-  required: true
-  description: The size of the MIQ APP PV given in Gi
-  value: 5Gi
-- name: BASE_PATH
-  displayName: Exports Directory Base Path
-  required: true
-  description: The parent directory of your NFS exports
-  value: "/exports"
-- name: NFS_HOST
-  displayName: NFS Server Hostname
-  required: true
-  description: The hostname or IP address of the NFS server
diff --git a/roles/openshift_cfme/files/templates/manageiq/miq-restore-job.yaml b/roles/openshift_cfme/files/templates/manageiq/miq-restore-job.yaml
deleted file mode 100644
index eea284dd4..000000000
--- a/roles/openshift_cfme/files/templates/manageiq/miq-restore-job.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: manageiq-restore
-spec:
-  template:
-    metadata:
-      name: manageiq-restore
-    spec:
-      containers:
-      - name: postgresql
-        image: docker.io/manageiq/postgresql:latest
-        command:
-        - "/opt/manageiq/container-scripts/restore_db"
-        env:
-        - name: DATABASE_URL
-          valueFrom:
-            secretKeyRef:
-              name: manageiq-secrets
-              key: database-url
-        - name: BACKUP_VERSION
-          value: latest
-        volumeMounts:
-        - name: miq-backup-vol
-          mountPath: "/backups"
-        - name: miq-prod-vol
-          mountPath: "/restore"
-      volumes:
-      - name: miq-backup-vol
-        persistentVolumeClaim:
-          claimName: manageiq-backup
-      - name: miq-prod-vol
-        persistentVolumeClaim:
-          claimName: manageiq-postgresql
-      restartPolicy: Never
diff --git a/roles/openshift_cfme/files/templates/manageiq/miq-template-ext-db.yaml b/roles/openshift_cfme/files/templates/manageiq/miq-template-ext-db.yaml
deleted file mode 100644
index 82cd5d49e..000000000
--- a/roles/openshift_cfme/files/templates/manageiq/miq-template-ext-db.yaml
+++ /dev/null
@@ -1,771 +0,0 @@
-apiVersion: v1
-kind: Template
-labels:
-  template: manageiq-ext-db
-metadata:
-  name: manageiq-ext-db
-  annotations:
-    description: ManageIQ appliance with persistent storage using a external DB host
-    tags: instant-app,manageiq,miq
-    iconClass: icon-rails
-objects:
-- apiVersion: v1
-  kind: ServiceAccount
-  metadata:
-    name: miq-orchestrator
-- apiVersion: v1
-  kind: ServiceAccount
-  metadata:
-    name: miq-anyuid
-- apiVersion: v1
-  kind: ServiceAccount
-  metadata:
-    name: miq-privileged
-- apiVersion: v1
-  kind: ServiceAccount
-  metadata:
-    name: miq-httpd
-- apiVersion: v1
-  kind: Secret
-  metadata:
-    name: "${NAME}-secrets"
-  stringData:
-    pg-password: "${DATABASE_PASSWORD}"
-    database-url: postgresql://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_SERVICE_NAME}/${DATABASE_NAME}?encoding=utf8&pool=5&wait_timeout=5
-    v2-key: "${V2_KEY}"
-- apiVersion: v1
-  kind: Secret
-  metadata:
-    name: "${ANSIBLE_SERVICE_NAME}-secrets"
-  stringData:
-    rabbit-password: "${ANSIBLE_RABBITMQ_PASSWORD}"
-    secret-key: "${ANSIBLE_SECRET_KEY}"
-    admin-password: "${ANSIBLE_ADMIN_PASSWORD}"
-- apiVersion: v1
-  kind: Service
-  metadata:
-    annotations:
-      description: Exposes and load balances ManageIQ pods
-      service.alpha.openshift.io/dependencies: '[{"name":"${DATABASE_SERVICE_NAME}","namespace":"","kind":"Service"},{"name":"${MEMCACHED_SERVICE_NAME}","namespace":"","kind":"Service"}]'
-    name: "${NAME}"
-  spec:
-    clusterIP: None
-    ports:
-    - name: http
-      port: 80
-      protocol: TCP
-      targetPort: 80
-    selector:
-      name: "${NAME}"
-- apiVersion: v1
-  kind: Route
-  metadata:
-    name: "${HTTPD_SERVICE_NAME}"
-  spec:
-    host: "${APPLICATION_DOMAIN}"
-    port:
-      targetPort: http
-    tls:
-      termination: edge
-      insecureEdgeTerminationPolicy: Redirect
-    to:
-      kind: Service
-      name: "${HTTPD_SERVICE_NAME}"
-- apiVersion: apps/v1beta1
-  kind: StatefulSet
-  metadata:
-    name: "${NAME}"
-    annotations:
-      description: Defines how to deploy the ManageIQ appliance
-  spec:
-    serviceName: "${NAME}"
-    replicas: "${APPLICATION_REPLICA_COUNT}"
-    template:
-      metadata:
-        labels:
-          name: "${NAME}"
-        name: "${NAME}"
-      spec:
-        containers:
-        - name: manageiq
-          image: "${APPLICATION_IMG_NAME}:${FRONTEND_APPLICATION_IMG_TAG}"
-          livenessProbe:
-            tcpSocket:
-              port: 80
-            initialDelaySeconds: 480
-            timeoutSeconds: 3
-          readinessProbe:
-            httpGet:
-              path: "/"
-              port: 80
-              scheme: HTTP
-            initialDelaySeconds: 200
-            timeoutSeconds: 3
-          ports:
-          - containerPort: 80
-            protocol: TCP
-          volumeMounts:
-          - name: "${NAME}-server"
-            mountPath: "/persistent"
-          env:
-          - name: MY_POD_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
-          - name: APPLICATION_INIT_DELAY
-            value: "${APPLICATION_INIT_DELAY}"
-          - name: DATABASE_SERVICE_NAME
-            value: "${DATABASE_SERVICE_NAME}"
-          - name: DATABASE_REGION
-            value: "${DATABASE_REGION}"
-          - name: DATABASE_URL
-            valueFrom:
-              secretKeyRef:
-                name: "${NAME}-secrets"
-                key: database-url
-          - name: MEMCACHED_SERVER
-            value: "${MEMCACHED_SERVICE_NAME}:11211"
-          - name: MEMCACHED_SERVICE_NAME
-            value: "${MEMCACHED_SERVICE_NAME}"
-          - name: V2_KEY
-            valueFrom:
-              secretKeyRef:
-                name: "${NAME}-secrets"
-                key: v2-key
-          - name: ANSIBLE_SERVICE_NAME
-            value: "${ANSIBLE_SERVICE_NAME}"
-          - name: ANSIBLE_ADMIN_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: "${ANSIBLE_SERVICE_NAME}-secrets"
-                key: admin-password
-          resources:
-            requests:
-              memory: "${APPLICATION_MEM_REQ}"
-              cpu: "${APPLICATION_CPU_REQ}"
-            limits:
-              memory: "${APPLICATION_MEM_LIMIT}"
-          lifecycle:
-            preStop:
-              exec:
-                command:
-                - "/opt/manageiq/container-scripts/sync-pv-data"
-        serviceAccount: miq-orchestrator
-        serviceAccountName: miq-orchestrator
-        terminationGracePeriodSeconds: 90
-    volumeClaimTemplates:
-    - metadata:
-        name: "${NAME}-server"
-        annotations:
-      spec:
-        accessModes:
-        - ReadWriteOnce
-        resources:
-          requests:
-            storage: "${APPLICATION_VOLUME_CAPACITY}"
-- apiVersion: v1
-  kind: Service
-  metadata:
-    annotations:
-      description: Headless service for ManageIQ backend pods
-    name: "${NAME}-backend"
-  spec:
-    clusterIP: None
-    selector:
-      name: "${NAME}-backend"
-- apiVersion: apps/v1beta1
-  kind: StatefulSet
-  metadata:
-    name: "${NAME}-backend"
-    annotations:
-      description: Defines how to deploy the ManageIQ appliance
-  spec:
-    serviceName: "${NAME}-backend"
-    replicas: 0
-    template:
-      metadata:
-        labels:
-          name: "${NAME}-backend"
-        name: "${NAME}-backend"
-      spec:
-        containers:
-        - name: manageiq
-          image: "${APPLICATION_IMG_NAME}:${BACKEND_APPLICATION_IMG_TAG}"
-          livenessProbe:
-            exec:
-              command:
-              - pidof
-              - MIQ Server
-            initialDelaySeconds: 480
-            timeoutSeconds: 3
-          volumeMounts:
-          - name: "${NAME}-server"
-            mountPath: "/persistent"
-          env:
-          - name: APPLICATION_INIT_DELAY
-            value: "${APPLICATION_INIT_DELAY}"
-          - name: DATABASE_URL
-            valueFrom:
-              secretKeyRef:
-                name: "${NAME}-secrets"
-                key: database-url
-          - name: MIQ_SERVER_DEFAULT_ROLES
-            value: database_operations,event,reporting,scheduler,smartstate,ems_operations,ems_inventory,automate
-          - name: FRONTEND_SERVICE_NAME
-            value: "${NAME}"
-          - name: MEMCACHED_SERVER
-            value: "${MEMCACHED_SERVICE_NAME}:11211"
-          - name: V2_KEY
-            valueFrom:
-              secretKeyRef:
-                name: "${NAME}-secrets"
-                key: v2-key
-          - name: ANSIBLE_SERVICE_NAME
-            value: "${ANSIBLE_SERVICE_NAME}"
-          - name: ANSIBLE_ADMIN_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: "${ANSIBLE_SERVICE_NAME}-secrets"
-                key: admin-password
-          resources:
-            requests:
-              memory: "${APPLICATION_MEM_REQ}"
-              cpu: "${APPLICATION_CPU_REQ}"
-            limits:
-              memory: "${APPLICATION_MEM_LIMIT}"
-          lifecycle:
-            preStop:
-              exec:
-                command:
-                - "/opt/manageiq/container-scripts/sync-pv-data"
-        serviceAccount: miq-orchestrator
-        serviceAccountName: miq-orchestrator
-        terminationGracePeriodSeconds: 90
-    volumeClaimTemplates:
-    - metadata:
-        name: "${NAME}-server"
-        annotations:
-      spec:
-        accessModes:
-        - ReadWriteOnce
-        resources:
-          requests:
-            storage: "${APPLICATION_VOLUME_CAPACITY}"
-- apiVersion: v1
-  kind: Service
-  metadata:
-    name: "${MEMCACHED_SERVICE_NAME}"
-    annotations:
-      description: Exposes the memcached server
-  spec:
-    ports:
-    - name: memcached
-      port: 11211
-      targetPort: 11211
-    selector:
-      name: "${MEMCACHED_SERVICE_NAME}"
-- apiVersion: v1
-  kind: DeploymentConfig
-  metadata:
-    name: "${MEMCACHED_SERVICE_NAME}"
-    annotations:
-      description: Defines how to deploy memcached
-  spec:
-    strategy:
-      type: Recreate
-    triggers:
-    - type: ConfigChange
-    replicas: 1
-    selector:
-      name: "${MEMCACHED_SERVICE_NAME}"
-    template:
-      metadata:
-        name: "${MEMCACHED_SERVICE_NAME}"
-        labels:
-          name: "${MEMCACHED_SERVICE_NAME}"
-      spec:
-        volumes: []
-        containers:
-        - name: memcached
-          image: "${MEMCACHED_IMG_NAME}:${MEMCACHED_IMG_TAG}"
-          ports:
-          - containerPort: 11211
-          readinessProbe:
-            timeoutSeconds: 1
-            initialDelaySeconds: 5
-            tcpSocket:
-              port: 11211
-          livenessProbe:
-            timeoutSeconds: 1
-            initialDelaySeconds: 30
-            tcpSocket:
-              port: 11211
-          volumeMounts: []
-          env:
-          - name: MEMCACHED_MAX_MEMORY
-            value: "${MEMCACHED_MAX_MEMORY}"
-          - name: MEMCACHED_MAX_CONNECTIONS
-            value: "${MEMCACHED_MAX_CONNECTIONS}"
-          - name: MEMCACHED_SLAB_PAGE_SIZE
-            value: "${MEMCACHED_SLAB_PAGE_SIZE}"
-          resources:
-            requests:
-              memory: "${MEMCACHED_MEM_REQ}"
-              cpu: "${MEMCACHED_CPU_REQ}"
-            limits:
-              memory: "${MEMCACHED_MEM_LIMIT}"
-- apiVersion: v1
-  kind: Service
-  metadata:
-    name: "${DATABASE_SERVICE_NAME}"
-    annotations:
-      description: Remote database service
-  spec:
-    ports:
-    - name: postgresql
-      port: 5432
-      targetPort: "${{DATABASE_PORT}}"
-    selector: {}
-- apiVersion: v1
-  kind: Endpoints
-  metadata:
-    name: "${DATABASE_SERVICE_NAME}"
-  subsets:
-  - addresses:
-    - ip: "${DATABASE_IP}"
-    ports:
-    - port: "${{DATABASE_PORT}}"
-      name: postgresql
-- apiVersion: v1
-  kind: Service
-  metadata:
-    annotations:
-      description: Exposes and load balances Ansible pods
-      service.alpha.openshift.io/dependencies: '[{"name":"${DATABASE_SERVICE_NAME}","namespace":"","kind":"Service"}]'
-    name: "${ANSIBLE_SERVICE_NAME}"
-  spec:
-    ports:
-    - name: http
-      port: 80
-      protocol: TCP
-      targetPort: 80
-    - name: https
-      port: 443
-      protocol: TCP
-      targetPort: 443
-    selector:
-      name: "${ANSIBLE_SERVICE_NAME}"
-- apiVersion: v1
-  kind: DeploymentConfig
-  metadata:
-    name: "${ANSIBLE_SERVICE_NAME}"
-    annotations:
-      description: Defines how to deploy the Ansible appliance
-  spec:
-    strategy:
-      type: Recreate
-    serviceName: "${ANSIBLE_SERVICE_NAME}"
-    replicas: 0
-    template:
-      metadata:
-        labels:
-          name: "${ANSIBLE_SERVICE_NAME}"
-        name: "${ANSIBLE_SERVICE_NAME}"
-      spec:
-        containers:
-        - name: ansible
-          image: "${ANSIBLE_IMG_NAME}:${ANSIBLE_IMG_TAG}"
-          livenessProbe:
-            tcpSocket:
-              port: 443
-            initialDelaySeconds: 480
-            timeoutSeconds: 3
-          readinessProbe:
-            httpGet:
-              path: "/"
-              port: 443
-              scheme: HTTPS
-            initialDelaySeconds: 200
-            timeoutSeconds: 3
-          ports:
-          - containerPort: 80
-            protocol: TCP
-          - containerPort: 443
-            protocol: TCP
-          securityContext:
-            privileged: true
-          env:
-          - name: ADMIN_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: "${ANSIBLE_SERVICE_NAME}-secrets"
-                key: admin-password
-          - name: RABBITMQ_USER_NAME
-            value: "${ANSIBLE_RABBITMQ_USER_NAME}"
-          - name: RABBITMQ_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: "${ANSIBLE_SERVICE_NAME}-secrets"
-                key: rabbit-password
-          - name: ANSIBLE_SECRET_KEY
-            valueFrom:
-              secretKeyRef:
-                name: "${ANSIBLE_SERVICE_NAME}-secrets"
-                key: secret-key
-          - name: DATABASE_SERVICE_NAME
-            value: "${DATABASE_SERVICE_NAME}"
-          - name: POSTGRESQL_USER
-            value: "${DATABASE_USER}"
-          - name: POSTGRESQL_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: "${NAME}-secrets"
-                key: pg-password
-          - name: POSTGRESQL_DATABASE
-            value: "${ANSIBLE_DATABASE_NAME}"
-          resources:
-            requests:
-              memory: "${ANSIBLE_MEM_REQ}"
-              cpu: "${ANSIBLE_CPU_REQ}"
-            limits:
-              memory: "${ANSIBLE_MEM_LIMIT}"
-        serviceAccount: miq-privileged
-        serviceAccountName: miq-privileged
-- apiVersion: v1
-  kind: ConfigMap
-  metadata:
-    name: "${HTTPD_SERVICE_NAME}-configs"
-  data:
-    application.conf: |
-      # Timeout: The number of seconds before receives and sends time out.
-      Timeout 120
-
-      RewriteEngine On
-      Options SymLinksIfOwnerMatch
-
-      <VirtualHost *:80>
-        KeepAlive on
-        ProxyPreserveHost on
-        ProxyPass        /ws/ ws://${NAME}/ws/
-        ProxyPassReverse /ws/ ws://${NAME}/ws/
-        ProxyPass        / http://${NAME}/
-        ProxyPassReverse / http://${NAME}/
-      </VirtualHost>
-- apiVersion: v1
-  kind: ConfigMap
-  metadata:
-    name: "${HTTPD_SERVICE_NAME}-auth-configs"
-  data:
-    auth-type: internal
-    auth-configuration.conf: |
-      # External Authentication Configuration File
-      #
-      # For details on usage please see https://github.com/ManageIQ/manageiq-pods/blob/master/README.md#configuring-external-authentication
-- apiVersion: v1
-  kind: Service
-  metadata:
-    name: "${HTTPD_SERVICE_NAME}"
-    annotations:
-      description: Exposes the httpd server
-      service.alpha.openshift.io/dependencies: '[{"name":"${NAME}","namespace":"","kind":"Service"}]'
-  spec:
-    ports:
-    - name: http
-      port: 80
-      targetPort: 80
-    selector:
-      name: httpd
-- apiVersion: v1
-  kind: DeploymentConfig
-  metadata:
-    name: "${HTTPD_SERVICE_NAME}"
-    annotations:
-      description: Defines how to deploy httpd
-  spec:
-    strategy:
-      type: Recreate
-      recreateParams:
-        timeoutSeconds: 1200
-    triggers:
-    - type: ConfigChange
-    replicas: 1
-    selector:
-      name: "${HTTPD_SERVICE_NAME}"
-    template:
-      metadata:
-        name: "${HTTPD_SERVICE_NAME}"
-        labels:
-          name: "${HTTPD_SERVICE_NAME}"
-      spec:
-        volumes:
-        - name: httpd-config
-          configMap:
-            name: "${HTTPD_SERVICE_NAME}-configs"
-        - name: httpd-auth-config
-          configMap:
-            name: "${HTTPD_SERVICE_NAME}-auth-configs"
-        containers:
-        - name: httpd
-          image: "${HTTPD_IMG_NAME}:${HTTPD_IMG_TAG}"
-          ports:
-          - containerPort: 80
-          livenessProbe:
-            exec:
-              command:
-              - pidof
-              - httpd
-            initialDelaySeconds: 15
-            timeoutSeconds: 3
-          readinessProbe:
-            tcpSocket:
-              port: 80
-            initialDelaySeconds: 10
-            timeoutSeconds: 3
-          volumeMounts:
-          - name: httpd-config
-            mountPath: "${HTTPD_CONFIG_DIR}"
-          - name: httpd-auth-config
-            mountPath: "${HTTPD_AUTH_CONFIG_DIR}"
-          resources:
-            requests:
-              memory: "${HTTPD_MEM_REQ}"
-              cpu: "${HTTPD_CPU_REQ}"
-            limits:
-              memory: "${HTTPD_MEM_LIMIT}"
-          env:
-          - name: HTTPD_AUTH_TYPE
-            valueFrom:
-              configMapKeyRef:
-                name: "${HTTPD_SERVICE_NAME}-auth-configs"
-                key: auth-type
-          lifecycle:
-            postStart:
-              exec:
-                command:
-                - "/usr/bin/save-container-environment"
-        serviceAccount: miq-anyuid
-        serviceAccountName: miq-anyuid
-parameters:
-- name: NAME
-  displayName: Name
-  required: true
-  description: The name assigned to all of the frontend objects defined in this template.
-  value: manageiq
-- name: V2_KEY
-  displayName: ManageIQ Encryption Key
-  required: true
-  description: Encryption Key for ManageIQ Passwords
-  from: "[a-zA-Z0-9]{43}"
-  generate: expression
-- name: DATABASE_SERVICE_NAME
-  displayName: PostgreSQL Service Name
-  required: true
-  description: The name of the OpenShift Service exposed for the PostgreSQL container.
-  value: postgresql
-- name: DATABASE_USER
-  displayName: PostgreSQL User
-  required: true
-  description: PostgreSQL user that will access the database.
-  value: root
-- name: DATABASE_PASSWORD
-  displayName: PostgreSQL Password
-  required: true
-  description: Password for the PostgreSQL user.
-  from: "[a-zA-Z0-9]{8}"
-  generate: expression
-- name: DATABASE_IP
-  displayName: PostgreSQL Server IP
-  required: true
-  description: PostgreSQL external server IP used to configure service.
-  value: ''
-- name: DATABASE_PORT
-  displayName: PostgreSQL Server Port
-  required: true
-  description: PostgreSQL external server port used to configure service.
-  value: '5432'
-- name: DATABASE_NAME
-  required: true
-  displayName: PostgreSQL Database Name
-  description: Name of the PostgreSQL database accessed.
-  value: vmdb_production
-- name: DATABASE_REGION
-  required: true
-  displayName: Application Database Region
-  description: Database region that will be used for application.
-  value: '0'
-- name: ANSIBLE_DATABASE_NAME
-  displayName: Ansible PostgreSQL database name
-  required: true
-  description: The database to be used by the Ansible continer
-  value: awx
-- name: MEMCACHED_SERVICE_NAME
-  required: true
-  displayName: Memcached Service Name
-  description: The name of the OpenShift Service exposed for the Memcached container.
-  value: memcached
-- name: MEMCACHED_MAX_MEMORY
-  displayName: Memcached Max Memory
-  description: Memcached maximum memory for memcached object storage in MB.
-  value: '64'
-- name: MEMCACHED_MAX_CONNECTIONS
-  displayName: Memcached Max Connections
-  description: Memcached maximum number of connections allowed.
-  value: '1024'
-- name: MEMCACHED_SLAB_PAGE_SIZE
-  displayName: Memcached Slab Page Size
-  description: Memcached size of each slab page.
-  value: 1m
-- name: ANSIBLE_SERVICE_NAME
-  displayName: Ansible Service Name
-  description: The name of the OpenShift Service exposed for the Ansible container.
-  value: ansible
-- name: ANSIBLE_ADMIN_PASSWORD
-  displayName: Ansible admin User password
-  required: true
-  description: The password for the Ansible container admin user
-  from: "[a-zA-Z0-9]{32}"
-  generate: expression
-- name: ANSIBLE_SECRET_KEY
-  displayName: Ansible Secret Key
-  required: true
-  description: Encryption key for the Ansible container
-  from: "[a-f0-9]{32}"
-  generate: expression
-- name: ANSIBLE_RABBITMQ_USER_NAME
-  displayName: RabbitMQ Username
-  required: true
-  description: Username for the Ansible RabbitMQ Server
-  value: ansible
-- name: ANSIBLE_RABBITMQ_PASSWORD
-  displayName: RabbitMQ Server Password
-  required: true
-  description: Password for the Ansible RabbitMQ Server
-  from: "[a-zA-Z0-9]{32}"
-  generate: expression
-- name: APPLICATION_CPU_REQ
-  displayName: Application Min CPU Requested
-  required: true
-  description: Minimum amount of CPU time the Application container will need (expressed in millicores).
-  value: 1000m
-- name: MEMCACHED_CPU_REQ
-  displayName: Memcached Min CPU Requested
-  required: true
-  description: Minimum amount of CPU time the Memcached container will need (expressed in millicores).
-  value: 200m
-- name: ANSIBLE_CPU_REQ
-  displayName: Ansible Min CPU Requested
-  required: true
-  description: Minimum amount of CPU time the Ansible container will need (expressed in millicores).
-  value: 1000m
-- name: APPLICATION_MEM_REQ
-  displayName: Application Min RAM Requested
-  required: true
-  description: Minimum amount of memory the Application container will need.
-  value: 6144Mi
-- name: MEMCACHED_MEM_REQ
-  displayName: Memcached Min RAM Requested
-  required: true
-  description: Minimum amount of memory the Memcached container will need.
-  value: 64Mi
-- name: ANSIBLE_MEM_REQ
-  displayName: Ansible Min RAM Requested
-  required: true
-  description: Minimum amount of memory the Ansible container will need.
-  value: 2048Mi
-- name: APPLICATION_MEM_LIMIT
-  displayName: Application Max RAM Limit
-  required: true
-  description: Maximum amount of memory the Application container can consume.
-  value: 16384Mi
-- name: MEMCACHED_MEM_LIMIT
-  displayName: Memcached Max RAM Limit
-  required: true
-  description: Maximum amount of memory the Memcached container can consume.
-  value: 256Mi
-- name: ANSIBLE_MEM_LIMIT
-  displayName: Ansible Max RAM Limit
-  required: true
-  description: Maximum amount of memory the Ansible container can consume.
-  value: 8096Mi
-- name: MEMCACHED_IMG_NAME
-  displayName: Memcached Image Name
-  description: This is the Memcached image name requested to deploy.
-  value: docker.io/manageiq/memcached
-- name: MEMCACHED_IMG_TAG
-  displayName: Memcached Image Tag
-  description: This is the Memcached image tag/version requested to deploy.
-  value: latest
-- name: APPLICATION_IMG_NAME
-  displayName: Application Image Name
-  description: This is the Application image name requested to deploy.
-  value: docker.io/manageiq/manageiq-pods
-- name: FRONTEND_APPLICATION_IMG_TAG
-  displayName: Front end Application Image Tag
-  description: This is the ManageIQ Frontend Application image tag/version requested to deploy.
-  value: frontend-latest
-- name: BACKEND_APPLICATION_IMG_TAG
-  displayName: Back end Application Image Tag
-  description: This is the ManageIQ Backend Application image tag/version requested to deploy.
-  value: backend-latest
-- name: ANSIBLE_IMG_NAME
-  displayName: Ansible Image Name
-  description: This is the Ansible image name requested to deploy.
-  value: docker.io/manageiq/embedded-ansible
-- name: ANSIBLE_IMG_TAG
-  displayName: Ansible Image Tag
-  description: This is the Ansible image tag/version requested to deploy.
-  value: latest
-- name: APPLICATION_DOMAIN
-  displayName: Application Hostname
-  description: The exposed hostname that will route to the application service, if left blank a value will be defaulted.
-  value: ''
-- name: APPLICATION_REPLICA_COUNT
-  displayName: Application Replica Count
-  description: This is the number of Application replicas requested to deploy.
-  value: '1'
-- name: APPLICATION_INIT_DELAY
-  displayName: Application Init Delay
-  required: true
-  description: Delay in seconds before we attempt to initialize the application.
-  value: '15'
-- name: APPLICATION_VOLUME_CAPACITY
-  displayName: Application Volume Capacity
-  required: true
-  description: Volume space available for application data.
-  value: 5Gi
-- name: HTTPD_SERVICE_NAME
-  required: true
-  displayName: Apache httpd Service Name
-  description: The name of the OpenShift Service exposed for the httpd container.
-  value: httpd
-- name: HTTPD_IMG_NAME
-  displayName: Apache httpd Image Name
-  description: This is the httpd image name requested to deploy.
-  value: docker.io/manageiq/httpd
-- name: HTTPD_IMG_TAG
-  displayName: Apache httpd Image Tag
-  description: This is the httpd image tag/version requested to deploy.
-  value: latest
-- name: HTTPD_CONFIG_DIR
-  displayName: Apache httpd Configuration Directory
-  description: Directory used to store the Apache configuration files.
-  value: "/etc/httpd/conf.d"
-- name: HTTPD_AUTH_CONFIG_DIR
-  displayName: External Authentication Configuration Directory
-  description: Directory used to store the external authentication configuration files.
-  value: "/etc/httpd/auth-conf.d"
-- name: HTTPD_CPU_REQ
-  displayName: Apache httpd Min CPU Requested
-  required: true
-  description: Minimum amount of CPU time the httpd container will need (expressed in millicores).
-  value: 500m
-- name: HTTPD_MEM_REQ
-  displayName: Apache httpd Min RAM Requested
-  required: true
-  description: Minimum amount of memory the httpd container will need.
-  value: 512Mi
-- name: HTTPD_MEM_LIMIT
-  displayName: Apache httpd Max RAM Limit
-  required: true
-  description: Maximum amount of memory the httpd container can consume.
-  value: 8192Mi
diff --git a/roles/openshift_cfme/files/templates/manageiq/miq-template.yaml b/roles/openshift_cfme/files/templates/manageiq/miq-template.yaml
deleted file mode 100644
index 3f5a12205..000000000
--- a/roles/openshift_cfme/files/templates/manageiq/miq-template.yaml
+++ /dev/null
@@ -1,948 +0,0 @@
-apiVersion: v1
-kind: Template
-labels:
-  template: manageiq
-metadata:
-  name: manageiq
-  annotations:
-    description: ManageIQ appliance with persistent storage
-    tags: instant-app,manageiq,miq
-    iconClass: icon-rails
-objects:
-- apiVersion: v1
-  kind: ServiceAccount
-  metadata:
-    name: miq-orchestrator
-- apiVersion: v1
-  kind: ServiceAccount
-  metadata:
-    name: miq-anyuid
-- apiVersion: v1
-  kind: ServiceAccount
-  metadata:
-    name: miq-privileged
-- apiVersion: v1
-  kind: ServiceAccount
-  metadata:
-    name: miq-httpd
-- apiVersion: v1
-  kind: Secret
-  metadata:
-    name: "${NAME}-secrets"
-  stringData:
-    pg-password: "${DATABASE_PASSWORD}"
-    database-url: postgresql://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_SERVICE_NAME}/${DATABASE_NAME}?encoding=utf8&pool=5&wait_timeout=5
-    v2-key: "${V2_KEY}"
-- apiVersion: v1
-  kind: Secret
-  metadata:
-    name: "${ANSIBLE_SERVICE_NAME}-secrets"
-  stringData:
-    rabbit-password: "${ANSIBLE_RABBITMQ_PASSWORD}"
-    secret-key: "${ANSIBLE_SECRET_KEY}"
-    admin-password: "${ANSIBLE_ADMIN_PASSWORD}"
-- apiVersion: v1
-  kind: ConfigMap
-  metadata:
-    name: "${DATABASE_SERVICE_NAME}-configs"
-  data:
-    01_miq_overrides.conf: |
-      #------------------------------------------------------------------------------
-      # CONNECTIONS AND AUTHENTICATION
-      #------------------------------------------------------------------------------
-
-      tcp_keepalives_count = 9
-      tcp_keepalives_idle = 3
-      tcp_keepalives_interval = 75
-
-      #------------------------------------------------------------------------------
-      # RESOURCE USAGE (except WAL)
-      #------------------------------------------------------------------------------
-
-      shared_preload_libraries = 'pglogical,repmgr_funcs'
-      max_worker_processes = 10
-
-      #------------------------------------------------------------------------------
-      # WRITE AHEAD LOG
-      #------------------------------------------------------------------------------
-
-      wal_level = 'logical'
-      wal_log_hints = on
-      wal_buffers = 16MB
-      checkpoint_completion_target = 0.9
-
-      #------------------------------------------------------------------------------
-      # REPLICATION
-      #------------------------------------------------------------------------------
-
-      max_wal_senders = 10
-      wal_sender_timeout = 0
-      max_replication_slots = 10
-      hot_standby = on
-
-      #------------------------------------------------------------------------------
-      # ERROR REPORTING AND LOGGING
-      #------------------------------------------------------------------------------
-
-      log_filename = 'postgresql.log'
-      log_rotation_age = 0
-      log_min_duration_statement = 5000
-      log_connections = on
-      log_disconnections = on
-      log_line_prefix = '%t:%r:%c:%u@%d:[%p]:'
-      log_lock_waits = on
-
-      #------------------------------------------------------------------------------
-      # AUTOVACUUM PARAMETERS
-      #------------------------------------------------------------------------------
-
-      log_autovacuum_min_duration = 0
-      autovacuum_naptime = 5min
-      autovacuum_vacuum_threshold = 500
-      autovacuum_analyze_threshold = 500
-      autovacuum_vacuum_scale_factor = 0.05
-
-      #------------------------------------------------------------------------------
-      # LOCK MANAGEMENT
-      #------------------------------------------------------------------------------
-
-      deadlock_timeout = 5s
-
-      #------------------------------------------------------------------------------
-      # VERSION/PLATFORM COMPATIBILITY
-      #------------------------------------------------------------------------------
-
-      escape_string_warning = off
-      standard_conforming_strings = off
-- apiVersion: v1
-  kind: ConfigMap
-  metadata:
-    name: "${HTTPD_SERVICE_NAME}-configs"
-  data:
-    application.conf: |
-      # Timeout: The number of seconds before receives and sends time out.
-      Timeout 120
-
-      RewriteEngine On
-      Options SymLinksIfOwnerMatch
-
-      <VirtualHost *:80>
-        KeepAlive on
-        ProxyPreserveHost on
-        ProxyPass        /ws/ ws://${NAME}/ws/
-        ProxyPassReverse /ws/ ws://${NAME}/ws/
-        ProxyPass        / http://${NAME}/
-        ProxyPassReverse / http://${NAME}/
-      </VirtualHost>
-- apiVersion: v1
-  kind: ConfigMap
-  metadata:
-    name: "${HTTPD_SERVICE_NAME}-auth-configs"
-  data:
-    auth-type: internal
-    auth-configuration.conf: |
-      # External Authentication Configuration File
-      #
-      # For details on usage please see https://github.com/ManageIQ/manageiq-pods/blob/master/README.md#configuring-external-authentication
-- apiVersion: v1
-  kind: Service
-  metadata:
-    annotations:
-      description: Exposes and load balances ManageIQ pods
-      service.alpha.openshift.io/dependencies: '[{"name":"${DATABASE_SERVICE_NAME}","namespace":"","kind":"Service"},{"name":"${MEMCACHED_SERVICE_NAME}","namespace":"","kind":"Service"}]'
-    name: "${NAME}"
-  spec:
-    clusterIP: None
-    ports:
-    - name: http
-      port: 80
-      protocol: TCP
-      targetPort: 80
-    selector:
-      name: "${NAME}"
-- apiVersion: v1
-  kind: Route
-  metadata:
-    name: "${HTTPD_SERVICE_NAME}"
-  spec:
-    host: "${APPLICATION_DOMAIN}"
-    port:
-      targetPort: http
-    tls:
-      termination: edge
-      insecureEdgeTerminationPolicy: Redirect
-    to:
-      kind: Service
-      name: "${HTTPD_SERVICE_NAME}"
-- apiVersion: v1
-  kind: PersistentVolumeClaim
-  metadata:
-    name: "${NAME}-${DATABASE_SERVICE_NAME}"
-  spec:
-    accessModes:
-    - ReadWriteOnce
-    resources:
-      requests:
-        storage: "${DATABASE_VOLUME_CAPACITY}"
-- apiVersion: apps/v1beta1
-  kind: StatefulSet
-  metadata:
-    name: "${NAME}"
-    annotations:
-      description: Defines how to deploy the ManageIQ appliance
-  spec:
-    serviceName: "${NAME}"
-    replicas: "${APPLICATION_REPLICA_COUNT}"
-    template:
-      metadata:
-        labels:
-          name: "${NAME}"
-        name: "${NAME}"
-      spec:
-        containers:
-        - name: manageiq
-          image: "${APPLICATION_IMG_NAME}:${FRONTEND_APPLICATION_IMG_TAG}"
-          livenessProbe:
-            tcpSocket:
-              port: 80
-            initialDelaySeconds: 480
-            timeoutSeconds: 3
-          readinessProbe:
-            httpGet:
-              path: "/"
-              port: 80
-              scheme: HTTP
-            initialDelaySeconds: 200
-            timeoutSeconds: 3
-          ports:
-          - containerPort: 80
-            protocol: TCP
-          volumeMounts:
-          - name: "${NAME}-server"
-            mountPath: "/persistent"
-          env:
-          - name: MY_POD_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
-          - name: APPLICATION_INIT_DELAY
-            value: "${APPLICATION_INIT_DELAY}"
-          - name: DATABASE_SERVICE_NAME
-            value: "${DATABASE_SERVICE_NAME}"
-          - name: DATABASE_REGION
-            value: "${DATABASE_REGION}"
-          - name: DATABASE_URL
-            valueFrom:
-              secretKeyRef:
-                name: "${NAME}-secrets"
-                key: database-url
-          - name: MEMCACHED_SERVER
-            value: "${MEMCACHED_SERVICE_NAME}:11211"
-          - name: MEMCACHED_SERVICE_NAME
-            value: "${MEMCACHED_SERVICE_NAME}"
-          - name: V2_KEY
-            valueFrom:
-              secretKeyRef:
-                name: "${NAME}-secrets"
-                key: v2-key
-          - name: ANSIBLE_SERVICE_NAME
-            value: "${ANSIBLE_SERVICE_NAME}"
-          - name: ANSIBLE_ADMIN_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: "${ANSIBLE_SERVICE_NAME}-secrets"
-                key: admin-password
-          resources:
-            requests:
-              memory: "${APPLICATION_MEM_REQ}"
-              cpu: "${APPLICATION_CPU_REQ}"
-            limits:
-              memory: "${APPLICATION_MEM_LIMIT}"
-          lifecycle:
-            preStop:
-              exec:
-                command:
-                - "/opt/manageiq/container-scripts/sync-pv-data"
-        serviceAccount: miq-orchestrator
-        serviceAccountName: miq-orchestrator
-        terminationGracePeriodSeconds: 90
-    volumeClaimTemplates:
-    - metadata:
-        name: "${NAME}-server"
-        annotations:
-      spec:
-        accessModes:
-        - ReadWriteOnce
-        resources:
-          requests:
-            storage: "${APPLICATION_VOLUME_CAPACITY}"
-- apiVersion: v1
-  kind: Service
-  metadata:
-    annotations:
-      description: Headless service for ManageIQ backend pods
-    name: "${NAME}-backend"
-  spec:
-    clusterIP: None
-    selector:
-      name: "${NAME}-backend"
-- apiVersion: apps/v1beta1
-  kind: StatefulSet
-  metadata:
-    name: "${NAME}-backend"
-    annotations:
-      description: Defines how to deploy the ManageIQ appliance
-  spec:
-    serviceName: "${NAME}-backend"
-    replicas: 0
-    template:
-      metadata:
-        labels:
-          name: "${NAME}-backend"
-        name: "${NAME}-backend"
-      spec:
-        containers:
-        - name: manageiq
-          image: "${APPLICATION_IMG_NAME}:${BACKEND_APPLICATION_IMG_TAG}"
-          livenessProbe:
-            exec:
-              command:
-              - pidof
-              - MIQ Server
-            initialDelaySeconds: 480
-            timeoutSeconds: 3
-          volumeMounts:
-          - name: "${NAME}-server"
-            mountPath: "/persistent"
-          env:
-          - name: APPLICATION_INIT_DELAY
-            value: "${APPLICATION_INIT_DELAY}"
-          - name: DATABASE_URL
-            valueFrom:
-              secretKeyRef:
-                name: "${NAME}-secrets"
-                key: database-url
-          - name: MIQ_SERVER_DEFAULT_ROLES
-            value: database_operations,event,reporting,scheduler,smartstate,ems_operations,ems_inventory,automate
-          - name: FRONTEND_SERVICE_NAME
-            value: "${NAME}"
-          - name: MEMCACHED_SERVER
-            value: "${MEMCACHED_SERVICE_NAME}:11211"
-          - name: V2_KEY
-            valueFrom:
-              secretKeyRef:
-                name: "${NAME}-secrets"
-                key: v2-key
-          - name: ANSIBLE_SERVICE_NAME
-            value: "${ANSIBLE_SERVICE_NAME}"
-          - name: ANSIBLE_ADMIN_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: "${ANSIBLE_SERVICE_NAME}-secrets"
-                key: admin-password
-          resources:
-            requests:
-              memory: "${APPLICATION_MEM_REQ}"
-              cpu: "${APPLICATION_CPU_REQ}"
-            limits:
-              memory: "${APPLICATION_MEM_LIMIT}"
-          lifecycle:
-            preStop:
-              exec:
-                command:
-                - "/opt/manageiq/container-scripts/sync-pv-data"
-        serviceAccount: miq-orchestrator
-        serviceAccountName: miq-orchestrator
-        terminationGracePeriodSeconds: 90
-    volumeClaimTemplates:
-    - metadata:
-        name: "${NAME}-server"
-        annotations:
-      spec:
-        accessModes:
-        - ReadWriteOnce
-        resources:
-          requests:
-            storage: "${APPLICATION_VOLUME_CAPACITY}"
-- apiVersion: v1
-  kind: Service
-  metadata:
-    name: "${MEMCACHED_SERVICE_NAME}"
-    annotations:
-      description: Exposes the memcached server
-  spec:
-    ports:
-    - name: memcached
-      port: 11211
-      targetPort: 11211
-    selector:
-      name: "${MEMCACHED_SERVICE_NAME}"
-- apiVersion: v1
-  kind: DeploymentConfig
-  metadata:
-    name: "${MEMCACHED_SERVICE_NAME}"
-    annotations:
-      description: Defines how to deploy memcached
-  spec:
-    strategy:
-      type: Recreate
-    triggers:
-    - type: ConfigChange
-    replicas: 1
-    selector:
-      name: "${MEMCACHED_SERVICE_NAME}"
-    template:
-      metadata:
-        name: "${MEMCACHED_SERVICE_NAME}"
-        labels:
-          name: "${MEMCACHED_SERVICE_NAME}"
-      spec:
-        volumes: []
-        containers:
-        - name: memcached
-          image: "${MEMCACHED_IMG_NAME}:${MEMCACHED_IMG_TAG}"
-          ports:
-          - containerPort: 11211
-          readinessProbe:
-            timeoutSeconds: 1
-            initialDelaySeconds: 5
-            tcpSocket:
-              port: 11211
-          livenessProbe:
-            timeoutSeconds: 1
-            initialDelaySeconds: 30
-            tcpSocket:
-              port: 11211
-          volumeMounts: []
-          env:
-          - name: MEMCACHED_MAX_MEMORY
-            value: "${MEMCACHED_MAX_MEMORY}"
-          - name: MEMCACHED_MAX_CONNECTIONS
-            value: "${MEMCACHED_MAX_CONNECTIONS}"
-          - name: MEMCACHED_SLAB_PAGE_SIZE
-            value: "${MEMCACHED_SLAB_PAGE_SIZE}"
-          resources:
-            requests:
-              memory: "${MEMCACHED_MEM_REQ}"
-              cpu: "${MEMCACHED_CPU_REQ}"
-            limits:
-              memory: "${MEMCACHED_MEM_LIMIT}"
-- apiVersion: v1
-  kind: Service
-  metadata:
-    name: "${DATABASE_SERVICE_NAME}"
-    annotations:
-      description: Exposes the database server
-  spec:
-    ports:
-    - name: postgresql
-      port: 5432
-      targetPort: 5432
-    selector:
-      name: "${DATABASE_SERVICE_NAME}"
-- apiVersion: v1
-  kind: DeploymentConfig
-  metadata:
-    name: "${DATABASE_SERVICE_NAME}"
-    annotations:
-      description: Defines how to deploy the database
-  spec:
-    strategy:
-      type: Recreate
-    triggers:
-    - type: ConfigChange
-    replicas: 1
-    selector:
-      name: "${DATABASE_SERVICE_NAME}"
-    template:
-      metadata:
-        name: "${DATABASE_SERVICE_NAME}"
-        labels:
-          name: "${DATABASE_SERVICE_NAME}"
-      spec:
-        volumes:
-        - name: miq-pgdb-volume
-          persistentVolumeClaim:
-            claimName: "${NAME}-${DATABASE_SERVICE_NAME}"
-        - name: miq-pg-configs
-          configMap:
-            name: "${DATABASE_SERVICE_NAME}-configs"
-        containers:
-        - name: postgresql
-          image: "${POSTGRESQL_IMG_NAME}:${POSTGRESQL_IMG_TAG}"
-          ports:
-          - containerPort: 5432
-          readinessProbe:
-            timeoutSeconds: 1
-            initialDelaySeconds: 15
-            exec:
-              command:
-              - "/bin/sh"
-              - "-i"
-              - "-c"
-              - psql -h 127.0.0.1 -U ${POSTGRESQL_USER} -q -d ${POSTGRESQL_DATABASE} -c 'SELECT 1'
-          livenessProbe:
-            timeoutSeconds: 1
-            initialDelaySeconds: 60
-            tcpSocket:
-              port: 5432
-          volumeMounts:
-          - name: miq-pgdb-volume
-            mountPath: "/var/lib/pgsql/data"
-          - name: miq-pg-configs
-            mountPath: "${POSTGRESQL_CONFIG_DIR}"
-          env:
-          - name: POSTGRESQL_USER
-            value: "${DATABASE_USER}"
-          - name: POSTGRESQL_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: "${NAME}-secrets"
-                key: pg-password
-          - name: POSTGRESQL_DATABASE
-            value: "${DATABASE_NAME}"
-          - name: POSTGRESQL_MAX_CONNECTIONS
-            value: "${POSTGRESQL_MAX_CONNECTIONS}"
-          - name: POSTGRESQL_SHARED_BUFFERS
-            value: "${POSTGRESQL_SHARED_BUFFERS}"
-          - name: POSTGRESQL_CONFIG_DIR
-            value: "${POSTGRESQL_CONFIG_DIR}"
-          resources:
-            requests:
-              memory: "${POSTGRESQL_MEM_REQ}"
-              cpu: "${POSTGRESQL_CPU_REQ}"
-            limits:
-              memory: "${POSTGRESQL_MEM_LIMIT}"
-- apiVersion: v1
-  kind: Service
-  metadata:
-    annotations:
-      description: Exposes and load balances Ansible pods
-      service.alpha.openshift.io/dependencies: '[{"name":"${DATABASE_SERVICE_NAME}","namespace":"","kind":"Service"}]'
-    name: "${ANSIBLE_SERVICE_NAME}"
-  spec:
-    ports:
-    - name: http
-      port: 80
-      protocol: TCP
-      targetPort: 80
-    - name: https
-      port: 443
-      protocol: TCP
-      targetPort: 443
-    selector:
-      name: "${ANSIBLE_SERVICE_NAME}"
-- apiVersion: v1
-  kind: DeploymentConfig
-  metadata:
-    name: "${ANSIBLE_SERVICE_NAME}"
-    annotations:
-      description: Defines how to deploy the Ansible appliance
-  spec:
-    strategy:
-      type: Recreate
-    serviceName: "${ANSIBLE_SERVICE_NAME}"
-    replicas: 0
-    template:
-      metadata:
-        labels:
-          name: "${ANSIBLE_SERVICE_NAME}"
-        name: "${ANSIBLE_SERVICE_NAME}"
-      spec:
-        containers:
-        - name: ansible
-          image: "${ANSIBLE_IMG_NAME}:${ANSIBLE_IMG_TAG}"
-          livenessProbe:
-            tcpSocket:
-              port: 443
-            initialDelaySeconds: 480
-            timeoutSeconds: 3
-          readinessProbe:
-            httpGet:
-              path: "/"
-              port: 443
-              scheme: HTTPS
-            initialDelaySeconds: 200
-            timeoutSeconds: 3
-          ports:
-          - containerPort: 80
-            protocol: TCP
-          - containerPort: 443
-            protocol: TCP
-          securityContext:
-            privileged: true
-          env:
-          - name: ADMIN_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: "${ANSIBLE_SERVICE_NAME}-secrets"
-                key: admin-password
-          - name: RABBITMQ_USER_NAME
-            value: "${ANSIBLE_RABBITMQ_USER_NAME}"
-          - name: RABBITMQ_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: "${ANSIBLE_SERVICE_NAME}-secrets"
-                key: rabbit-password
-          - name: ANSIBLE_SECRET_KEY
-            valueFrom:
-              secretKeyRef:
-                name: "${ANSIBLE_SERVICE_NAME}-secrets"
-                key: secret-key
-          - name: DATABASE_SERVICE_NAME
-            value: "${DATABASE_SERVICE_NAME}"
-          - name: POSTGRESQL_USER
-            value: "${DATABASE_USER}"
-          - name: POSTGRESQL_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: "${NAME}-secrets"
-                key: pg-password
-          - name: POSTGRESQL_DATABASE
-            value: "${ANSIBLE_DATABASE_NAME}"
-          resources:
-            requests:
-              memory: "${ANSIBLE_MEM_REQ}"
-              cpu: "${ANSIBLE_CPU_REQ}"
-            limits:
-              memory: "${ANSIBLE_MEM_LIMIT}"
-        serviceAccount: miq-privileged
-        serviceAccountName: miq-privileged
-- apiVersion: v1
-  kind: Service
-  metadata:
-    name: "${HTTPD_SERVICE_NAME}"
-    annotations:
-      description: Exposes the httpd server
-      service.alpha.openshift.io/dependencies: '[{"name":"${NAME}","namespace":"","kind":"Service"}]'
-  spec:
-    ports:
-    - name: http
-      port: 80
-      targetPort: 80
-    selector:
-      name: httpd
-- apiVersion: v1
-  kind: DeploymentConfig
-  metadata:
-    name: "${HTTPD_SERVICE_NAME}"
-    annotations:
-      description: Defines how to deploy httpd
-  spec:
-    strategy:
-      type: Recreate
-      recreateParams:
-        timeoutSeconds: 1200
-    triggers:
-    - type: ConfigChange
-    replicas: 1
-    selector:
-      name: "${HTTPD_SERVICE_NAME}"
-    template:
-      metadata:
-        name: "${HTTPD_SERVICE_NAME}"
-        labels:
-          name: "${HTTPD_SERVICE_NAME}"
-      spec:
-        volumes:
-        - name: httpd-config
-          configMap:
-            name: "${HTTPD_SERVICE_NAME}-configs"
-        - name: httpd-auth-config
-          configMap:
-            name: "${HTTPD_SERVICE_NAME}-auth-configs"
-        containers:
-        - name: httpd
-          image: "${HTTPD_IMG_NAME}:${HTTPD_IMG_TAG}"
-          ports:
-          - containerPort: 80
-          livenessProbe:
-            exec:
-              command:
-              - pidof
-              - httpd
-            initialDelaySeconds: 15
-            timeoutSeconds: 3
-          readinessProbe:
-            tcpSocket:
-              port: 80
-            initialDelaySeconds: 10
-            timeoutSeconds: 3
-          volumeMounts:
-          - name: httpd-config
-            mountPath: "${HTTPD_CONFIG_DIR}"
-          - name: httpd-auth-config
-            mountPath: "${HTTPD_AUTH_CONFIG_DIR}"
-          resources:
-            requests:
-              memory: "${HTTPD_MEM_REQ}"
-              cpu: "${HTTPD_CPU_REQ}"
-            limits:
-              memory: "${HTTPD_MEM_LIMIT}"
-          env:
-          - name: HTTPD_AUTH_TYPE
-            valueFrom:
-              configMapKeyRef:
-                name: "${HTTPD_SERVICE_NAME}-auth-configs"
-                key: auth-type
-          lifecycle:
-            postStart:
-              exec:
-                command:
-                - "/usr/bin/save-container-environment"
-        serviceAccount: miq-anyuid
-        serviceAccountName: miq-anyuid
-parameters:
-- name: NAME
-  displayName: Name
-  required: true
-  description: The name assigned to all of the frontend objects defined in this template.
-  value: manageiq
-- name: V2_KEY
-  displayName: ManageIQ Encryption Key
-  required: true
-  description: Encryption Key for ManageIQ Passwords
-  from: "[a-zA-Z0-9]{43}"
-  generate: expression
-- name: DATABASE_SERVICE_NAME
-  displayName: PostgreSQL Service Name
-  required: true
-  description: The name of the OpenShift Service exposed for the PostgreSQL container.
-  value: postgresql
-- name: DATABASE_USER
-  displayName: PostgreSQL User
-  required: true
-  description: PostgreSQL user that will access the database.
-  value: root
-- name: DATABASE_PASSWORD
-  displayName: PostgreSQL Password
-  required: true
-  description: Password for the PostgreSQL user.
-  from: "[a-zA-Z0-9]{8}"
-  generate: expression
-- name: DATABASE_NAME
-  required: true
-  displayName: PostgreSQL Database Name
-  description: Name of the PostgreSQL database accessed.
-  value: vmdb_production
-- name: DATABASE_REGION
-  required: true
-  displayName: Application Database Region
-  description: Database region that will be used for application.
-  value: '0'
-- name: ANSIBLE_DATABASE_NAME
-  displayName: Ansible PostgreSQL database name
-  required: true
-  description: The database to be used by the Ansible continer
-  value: awx
-- name: MEMCACHED_SERVICE_NAME
-  required: true
-  displayName: Memcached Service Name
-  description: The name of the OpenShift Service exposed for the Memcached container.
-  value: memcached
-- name: MEMCACHED_MAX_MEMORY
-  displayName: Memcached Max Memory
-  description: Memcached maximum memory for memcached object storage in MB.
-  value: '64'
-- name: MEMCACHED_MAX_CONNECTIONS
-  displayName: Memcached Max Connections
-  description: Memcached maximum number of connections allowed.
-  value: '1024'
-- name: MEMCACHED_SLAB_PAGE_SIZE
-  displayName: Memcached Slab Page Size
-  description: Memcached size of each slab page.
-  value: 1m
-- name: POSTGRESQL_CONFIG_DIR
-  displayName: PostgreSQL Configuration Overrides
-  description: Directory used to store PostgreSQL configuration overrides.
-  value: "/var/lib/pgsql/conf.d"
-- name: POSTGRESQL_MAX_CONNECTIONS
-  displayName: PostgreSQL Max Connections
-  description: PostgreSQL maximum number of database connections allowed.
-  value: '1000'
-- name: POSTGRESQL_SHARED_BUFFERS
-  displayName: PostgreSQL Shared Buffer Amount
-  description: Amount of memory dedicated for PostgreSQL shared memory buffers.
-  value: 1GB
-- name: ANSIBLE_SERVICE_NAME
-  displayName: Ansible Service Name
-  description: The name of the OpenShift Service exposed for the Ansible container.
-  value: ansible
-- name: ANSIBLE_ADMIN_PASSWORD
-  displayName: Ansible admin User password
-  required: true
-  description: The password for the Ansible container admin user
-  from: "[a-zA-Z0-9]{32}"
-  generate: expression
-- name: ANSIBLE_SECRET_KEY
-  displayName: Ansible Secret Key
-  required: true
-  description: Encryption key for the Ansible container
-  from: "[a-f0-9]{32}"
-  generate: expression
-- name: ANSIBLE_RABBITMQ_USER_NAME
-  displayName: RabbitMQ Username
-  required: true
-  description: Username for the Ansible RabbitMQ Server
-  value: ansible
-- name: ANSIBLE_RABBITMQ_PASSWORD
-  displayName: RabbitMQ Server Password
-  required: true
-  description: Password for the Ansible RabbitMQ Server
-  from: "[a-zA-Z0-9]{32}"
-  generate: expression
-- name: APPLICATION_CPU_REQ
-  displayName: Application Min CPU Requested
-  required: true
-  description: Minimum amount of CPU time the Application container will need (expressed in millicores).
-  value: 1000m
-- name: POSTGRESQL_CPU_REQ
-  displayName: PostgreSQL Min CPU Requested
-  required: true
-  description: Minimum amount of CPU time the PostgreSQL container will need (expressed in millicores).
-  value: 500m
-- name: MEMCACHED_CPU_REQ
-  displayName: Memcached Min CPU Requested
-  required: true
-  description: Minimum amount of CPU time the Memcached container will need (expressed in millicores).
-  value: 200m
-- name: ANSIBLE_CPU_REQ
-  displayName: Ansible Min CPU Requested
-  required: true
-  description: Minimum amount of CPU time the Ansible container will need (expressed in millicores).
-  value: 1000m
-- name: APPLICATION_MEM_REQ
-  displayName: Application Min RAM Requested
-  required: true
-  description: Minimum amount of memory the Application container will need.
-  value: 6144Mi
-- name: POSTGRESQL_MEM_REQ
-  displayName: PostgreSQL Min RAM Requested
-  required: true
-  description: Minimum amount of memory the PostgreSQL container will need.
-  value: 4Gi
-- name: MEMCACHED_MEM_REQ
-  displayName: Memcached Min RAM Requested
-  required: true
-  description: Minimum amount of memory the Memcached container will need.
-  value: 64Mi
-- name: ANSIBLE_MEM_REQ
-  displayName: Ansible Min RAM Requested
-  required: true
-  description: Minimum amount of memory the Ansible container will need.
-  value: 2048Mi
-- name: APPLICATION_MEM_LIMIT
-  displayName: Application Max RAM Limit
-  required: true
-  description: Maximum amount of memory the Application container can consume.
-  value: 16384Mi
-- name: POSTGRESQL_MEM_LIMIT
-  displayName: PostgreSQL Max RAM Limit
-  required: true
-  description: Maximum amount of memory the PostgreSQL container can consume.
-  value: 8Gi
-- name: MEMCACHED_MEM_LIMIT
-  displayName: Memcached Max RAM Limit
-  required: true
-  description: Maximum amount of memory the Memcached container can consume.
-  value: 256Mi
-- name: ANSIBLE_MEM_LIMIT
-  displayName: Ansible Max RAM Limit
-  required: true
-  description: Maximum amount of memory the Ansible container can consume.
-  value: 8096Mi
-- name: POSTGRESQL_IMG_NAME
-  displayName: PostgreSQL Image Name
-  description: This is the PostgreSQL image name requested to deploy.
-  value: docker.io/manageiq/postgresql
-- name: POSTGRESQL_IMG_TAG
-  displayName: PostgreSQL Image Tag
-  description: This is the PostgreSQL image tag/version requested to deploy.
-  value: latest
-- name: MEMCACHED_IMG_NAME
-  displayName: Memcached Image Name
-  description: This is the Memcached image name requested to deploy.
-  value: docker.io/manageiq/memcached
-- name: MEMCACHED_IMG_TAG
-  displayName: Memcached Image Tag
-  description: This is the Memcached image tag/version requested to deploy.
-  value: latest
-- name: APPLICATION_IMG_NAME
-  displayName: Application Image Name
-  description: This is the Application image name requested to deploy.
-  value: docker.io/manageiq/manageiq-pods
-- name: FRONTEND_APPLICATION_IMG_TAG
-  displayName: Front end Application Image Tag
-  description: This is the ManageIQ Frontend Application image tag/version requested to deploy.
-  value: frontend-latest
-- name: BACKEND_APPLICATION_IMG_TAG
-  displayName: Back end Application Image Tag
-  description: This is the ManageIQ Backend Application image tag/version requested to deploy.
-  value: backend-latest
-- name: ANSIBLE_IMG_NAME
-  displayName: Ansible Image Name
-  description: This is the Ansible image name requested to deploy.
-  value: docker.io/manageiq/embedded-ansible
-- name: ANSIBLE_IMG_TAG
-  displayName: Ansible Image Tag
-  description: This is the Ansible image tag/version requested to deploy.
-  value: latest
-- name: APPLICATION_DOMAIN
-  displayName: Application Hostname
-  description: The exposed hostname that will route to the application service, if left blank a value will be defaulted.
-  value: ''
-- name: APPLICATION_REPLICA_COUNT
-  displayName: Application Replica Count
-  description: This is the number of Application replicas requested to deploy.
-  value: '1'
-- name: APPLICATION_INIT_DELAY
-  displayName: Application Init Delay
-  required: true
-  description: Delay in seconds before we attempt to initialize the application.
-  value: '15'
-- name: APPLICATION_VOLUME_CAPACITY
-  displayName: Application Volume Capacity
-  required: true
-  description: Volume space available for application data.
-  value: 5Gi
-- name: DATABASE_VOLUME_CAPACITY
-  displayName: Database Volume Capacity
-  required: true
-  description: Volume space available for database.
-  value: 15Gi
-- name: HTTPD_SERVICE_NAME
-  required: true
-  displayName: Apache httpd Service Name
-  description: The name of the OpenShift Service exposed for the httpd container.
-  value: httpd
-- name: HTTPD_IMG_NAME
-  displayName: Apache httpd Image Name
-  description: This is the httpd image name requested to deploy.
-  value: docker.io/manageiq/httpd
-- name: HTTPD_IMG_TAG
-  displayName: Apache httpd Image Tag
-  description: This is the httpd image tag/version requested to deploy.
-  value: latest
-- name: HTTPD_CONFIG_DIR
-  displayName: Apache Configuration Directory
-  description: Directory used to store the Apache configuration files.
-  value: "/etc/httpd/conf.d"
-- name: HTTPD_AUTH_CONFIG_DIR
-  displayName: External Authentication Configuration Directory
-  description: Directory used to store the external authentication configuration files.
-  value: "/etc/httpd/auth-conf.d"
-- name: HTTPD_CPU_REQ
-  displayName: Apache httpd Min CPU Requested
-  required: true
-  description: Minimum amount of CPU time the httpd container will need (expressed in millicores).
-  value: 500m
-- name: HTTPD_MEM_REQ
-  displayName: Apache httpd Min RAM Requested
-  required: true
-  description: Minimum amount of memory the httpd container will need.
-  value: 512Mi
-- name: HTTPD_MEM_LIMIT
-  displayName: Apache httpd Max RAM Limit
-  required: true
-  description: Maximum amount of memory the httpd container can consume.
-  value: 8192Mi
diff --git a/roles/openshift_cfme/handlers/main.yml b/roles/openshift_cfme/handlers/main.yml
deleted file mode 100644
index e69de29bb..000000000
--- a/roles/openshift_cfme/handlers/main.yml
+++ /dev/null
diff --git a/roles/openshift_cfme/meta/main.yml b/roles/openshift_cfme/meta/main.yml
deleted file mode 100644
index 07ad51126..000000000
--- a/roles/openshift_cfme/meta/main.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-galaxy_info:
-  author: Tim Bielawa
-  description: OpenShift CFME (Manage IQ) Deployer
-  company: Red Hat, Inc.
-  license: Apache License, Version 2.0
-  min_ansible_version: 2.2
-  version: 1.0
-  platforms:
-  - name: EL
-    versions:
-    - 7
-  categories:
-  - cloud
-  - system
-dependencies:
-- role: lib_openshift
-- role: lib_utils
diff --git a/roles/openshift_cfme/tasks/accounts.yml b/roles/openshift_cfme/tasks/accounts.yml
deleted file mode 100644
index 64976cd0e..000000000
--- a/roles/openshift_cfme/tasks/accounts.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-# This role task file is responsible for user/system account creation,
-# and ensuring correct access is provided as required.
-- name: Ensure the CFME system accounts exist
-  oc_serviceaccount:
-    namespace: "{{ openshift_cfme_project }}"
-    state: present
-    name: "{{ openshift_cfme_flavor_short }}{{ item.name }}"
-  with_items:
-    - "{{ __openshift_system_account_sccs }}"
-
-- name: Ensure the CFME system accounts have all the required SCCs
-  oc_adm_policy_user:
-    namespace: "{{ openshift_cfme_project }}"
-    user: "system:serviceaccount:{{ openshift_cfme_project }}:{{ openshift_cfme_flavor_short }}{{ item.name }}"
-    resource_kind: scc
-    resource_name: "{{ item.resource_name }}"
-  with_items:
-    - "{{ __openshift_system_account_sccs }}"
-
-- name: Ensure the CFME system accounts have the required roles
-  oc_adm_policy_user:
-    namespace: "{{ openshift_cfme_project }}"
-    user: "system:serviceaccount:{{ openshift_cfme_project }}:{{ openshift_cfme_flavor_short }}{{ item.name }}"
-    resource_kind: role
-    resource_name: "{{ item.resource_name }}"
-  with_items:
-    - "{{ __openshift_cfme_system_account_roles }}"
diff --git a/roles/openshift_cfme/tasks/main.yml b/roles/openshift_cfme/tasks/main.yml
deleted file mode 100644
index 78a6710b3..000000000
--- a/roles/openshift_cfme/tasks/main.yml
+++ /dev/null
@@ -1,79 +0,0 @@
----
-######################################################################)
-# Users, projects, and privileges
-
-- name: Run pre-install CFME validation checks
-  include: validate.yml
-
-- name: "Ensure the CFME '{{ openshift_cfme_project }}' namespace exists"
-  oc_project:
-    state: present
-    name: "{{ openshift_cfme_project }}"
-    display_name: "{{ openshift_cfme_project_description }}"
-
-- name: Create and Authorize CFME Accounts
-  include: accounts.yml
-
-######################################################################
-# STORAGE - Initialize basic storage class
-#---------------------------------------------------------------------
-# * nfs - set up NFS shares on the first master for a proof of concept
-- name: Create required NFS exports for CFME app storage
-  include: storage/nfs.yml
-  when: openshift_cfme_storage_class == 'nfs'
-
-#---------------------------------------------------------------------
-# * external - NFS again, but pointing to a pre-configured NFS server
-- name: Note Storage Type -  External NFS
-  debug:
-    msg: "Setting up external NFS storage, openshift_cfme_storage_class is {{ openshift_cfme_storage_class }}"
-  when: openshift_cfme_storage_class == 'nfs_external'
-
-#---------------------------------------------------------------------
-# * cloudprovider - use an existing cloudprovider based storage
-- name: Note Storage Type - Cloud Provider
-  debug:
-    msg: Validating cloud provider storage type, openshift_cfme_storage_class is 'cloudprovider'
-  when: openshift_cfme_storage_class == 'cloudprovider'
-
-#---------------------------------------------------------------------
-# * preconfigured - don't do anything, assume it's all there ready to go
-- name: Note Storage Type - Preconfigured
-  debug:
-    msg: Skipping storage configuration, openshift_cfme_storage_class is 'preconfigured'
-  when: openshift_cfme_storage_class == 'preconfigured'
-
-######################################################################
-# APPLICATION TEMPLATE
-- name: Install the CFME app and PV templates
-  include: template.yml
-
-######################################################################
-# APP & DB Storage
-
-# For local/external NFS backed installations
-- name: "Create the required App and DB PVs using {{ openshift_cfme_storage_class }}"
-  include: storage/create_nfs_pvs.yml
-  when:
-    - openshift_cfme_storage_class in ['nfs', 'nfs_external']
-
-######################################################################
-# CREATE APP
-- name: Note the correct ext-db template name
-  set_fact:
-    openshift_cfme_template_name: "{{ openshift_cfme_flavor }}-ext-db"
-  when:
-    - openshift_cfme_app_template in ['miq-template-ext-db', 'cfme-template-ext-db']
-
-- name: Note the correct podified db template name
-  set_fact:
-    openshift_cfme_template_name: "{{ openshift_cfme_flavor }}"
-  when:
-    - openshift_cfme_app_template in ['miq-template', 'cfme-template']
-
-- name: Ensure the CFME App is created
-  oc_process:
-    namespace: "{{ openshift_cfme_project }}"
-    template_name: "{{ openshift_cfme_template_name }}"
-    create: True
-    params: "{{ openshift_cfme_template_parameters }}"
diff --git a/roles/openshift_cfme/tasks/storage/create_nfs_pvs.yml b/roles/openshift_cfme/tasks/storage/create_nfs_pvs.yml
deleted file mode 100644
index d5252464e..000000000
--- a/roles/openshift_cfme/tasks/storage/create_nfs_pvs.yml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-# Create the required PVs for the App and the DB
-- name: Note the App PV Size from Template Parameters
-  set_fact:
-    openshift_cfme_app_pv_size: "{{ openshift_cfme_template_parameters.APPLICATION_VOLUME_CAPACITY }}"
-  when:
-    - openshift_cfme_template_parameters.APPLICATION_VOLUME_CAPACITY is defined
-
-- name: Note the App PV Size from defaults
-  set_fact:
-    openshift_cfme_app_pv_size: "{{ __openshift_cfme_app_pv_size }}"
-  when:
-    - openshift_cfme_template_parameters.APPLICATION_VOLUME_CAPACITY is not defined
-
-- when: openshift_cfme_app_template in ['miq-template', 'cfme-template']
-  block:
-    - name: Note the DB PV Size from Template Parameters
-      set_fact:
-        openshift_cfme_db_pv_size: "{{ openshift_cfme_template_parameters.DATABASE_VOLUME_CAPACITY }}"
-      when:
-        - openshift_cfme_template_parameters.DATABASE_VOLUME_CAPACITY is defined
-
-    - name: Note the DB PV Size from defaults
-      set_fact:
-        openshift_cfme_db_pv_size: "{{ __openshift_cfme_db_pv_size }}"
-      when:
-        - openshift_cfme_template_parameters.DATABASE_VOLUME_CAPACITY is not defined
-
-- name: Check if the CFME App PV has been created
-  oc_obj:
-    namespace: "{{ openshift_cfme_project }}"
-    state: list
-    kind: pv
-    name: "{{ openshift_cfme_flavor_short }}-app"
-  register: miq_app_pv_check
-
-- name: Check if the CFME DB PV has been created
-  oc_obj:
-    namespace: "{{ openshift_cfme_project }}"
-    state: list
-    kind: pv
-    name: "{{ openshift_cfme_flavor_short }}-db"
-  register: miq_db_pv_check
-  when:
-    - openshift_cfme_app_template in ['miq-template', 'cfme-template']
-
-- name: Ensure the CFME App PV is created
-  oc_process:
-    namespace: "{{ openshift_cfme_project }}"
-    template_name: "{{ openshift_cfme_flavor }}-app-pv"
-    create: True
-    params:
-      PV_SIZE: "{{ openshift_cfme_app_pv_size }}"
-      BASE_PATH: "{{ openshift_cfme_storage_nfs_base_dir }}"
-      NFS_HOST: "{{ openshift_cfme_nfs_server }}"
-  when: miq_app_pv_check.results.results == [{}]
-
-- name: Ensure the CFME DB PV is created
-  oc_process:
-    namespace: "{{ openshift_cfme_project }}"
-    template_name: "{{ openshift_cfme_flavor }}-db-pv"
-    create: True
-    params:
-      PV_SIZE: "{{ openshift_cfme_db_pv_size }}"
-      BASE_PATH: "{{ openshift_cfme_storage_nfs_base_dir }}"
-      NFS_HOST: "{{ openshift_cfme_nfs_server }}"
-  when:
-    - openshift_cfme_app_template in ['miq-template', 'cfme-template']
-    - miq_db_pv_check.results.results == [{}]
diff --git a/roles/openshift_cfme/tasks/storage/nfs.yml b/roles/openshift_cfme/tasks/storage/nfs.yml
deleted file mode 100644
index c17544480..000000000
--- a/roles/openshift_cfme/tasks/storage/nfs.yml
+++ /dev/null
@@ -1,67 +0,0 @@
----
-# Tasks to statically provision NFS volumes
-# Include if not using dynamic volume provisioning
-
-- name: Ensure we save the local NFS server if one is provided
-  set_fact:
-    openshift_cfme_nfs_server: "{{ openshift_cfme_storage_nfs_local_hostname }}"
-  when:
-    - openshift_cfme_storage_nfs_local_hostname is defined
-    - openshift_cfme_storage_nfs_local_hostname != False
-    - openshift_cfme_storage_class == "nfs"
-
-- name: Ensure we save the local NFS server
-  set_fact:
-    openshift_cfme_nfs_server: "{{ groups['oo_nfs_to_config'].0 }}"
-  when:
-    - openshift_cfme_nfs_server is not defined
-    - openshift_cfme_storage_class == "nfs"
-
-- name: Ensure we save the external NFS server
-  set_fact:
-    openshift_cfme_nfs_server: "{{ openshift_cfme_storage_nfs_external_hostname }}"
-  when:
-    - openshift_cfme_storage_class == "nfs_external"
-
-- name: Failed NFS server detection
-  assert:
-    that:
-      - openshift_cfme_nfs_server is defined
-    msg: |
-      "Unable to detect an NFS server. The 'nfs_external'
-      openshift_cfme_storage_class option requires that you set
-      openshift_cfme_storage_nfs_external_hostname. NFS hosts detected
-      for local nfs services: {{ groups['oo_nfs_to_config'] | join(', ') }}"
-
-- name: Setting up NFS storage
-  block:
-    - name: Include the NFS Setup role tasks
-      include_role:
-        role: openshift_nfs
-        tasks_from: setup
-      vars:
-        l_nfs_base_dir: "{{ openshift_cfme_storage_nfs_base_dir }}"
-
-    - name: Create the App export
-      include_role:
-        role: openshift_nfs
-        tasks_from: create_export
-      vars:
-        l_nfs_base_dir: "{{ openshift_cfme_storage_nfs_base_dir }}"
-        l_nfs_export_config: "{{ openshift_cfme_flavor_short }}"
-        l_nfs_export_name: "{{ openshift_cfme_flavor_short }}-app"
-        l_nfs_options: "*(rw,no_root_squash,no_wdelay)"
-
-    - name: Create the DB export
-      include_role:
-        role: openshift_nfs
-        tasks_from: create_export
-      vars:
-        l_nfs_base_dir: "{{ openshift_cfme_storage_nfs_base_dir }}"
-        l_nfs_export_config: "{{ openshift_cfme_flavor_short }}"
-        l_nfs_export_name: "{{ openshift_cfme_flavor_short }}-db"
-        l_nfs_options: "*(rw,no_root_squash,no_wdelay)"
-      when:
-        - openshift_cfme_app_template in ['miq-template', 'cfme-template']
-
-  delegate_to: "{{ openshift_cfme_nfs_server }}"
diff --git a/roles/openshift_cfme/tasks/storage/storage.yml b/roles/openshift_cfme/tasks/storage/storage.yml
deleted file mode 100644
index d8bf7aa3e..000000000
--- a/roles/openshift_cfme/tasks/storage/storage.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- include: nfs.yml
-  when: not (openshift_cloudprovider_kind is defined and (openshift_cloudprovider_kind == 'aws' or openshift_cloudprovider_kind == 'gce'))
diff --git a/roles/openshift_cfme/tasks/template.yml b/roles/openshift_cfme/tasks/template.yml
deleted file mode 100644
index 2061e2bd7..000000000
--- a/roles/openshift_cfme/tasks/template.yml
+++ /dev/null
@@ -1,128 +0,0 @@
----
-# Tasks for ensuring the correct CFME templates are landed on the remote system
-
-######################################################################
-# CFME App Template
-#
-# Note, this is different from the create_nfs_pvs.yml tasks in that
-# the application template does not require any jinja2 evaluation.
-#
-# TODO: Handle the case where the server or PV templates are updated
-# in openshift-ansible and the change needs to be landed on the
-# managed cluster.
-
-######################################################################
-# STANDARD PODIFIED DATABASE TEMPLATE
-- when: openshift_cfme_app_template in ['miq-template', 'cfme-template']
-  block:
-  - name: Check if the CFME Server template has been created already
-    oc_obj:
-      namespace: "{{ openshift_cfme_project }}"
-      state: list
-      kind: template
-      name: "{{ openshift_cfme_flavor }}"
-    register: miq_server_check
-
-  - when: miq_server_check.results.results == [{}]
-    block:
-    - name: Copy over CFME Server template
-      copy:
-        src: "templates/{{ openshift_cfme_flavor }}/{{ openshift_cfme_flavor_short }}-template.yaml"
-        dest: "{{ template_dir }}/"
-
-    - name: Ensure CFME Server Template is created
-      oc_obj:
-        namespace: "{{ openshift_cfme_project }}"
-        name: "{{ openshift_cfme_flavor }}"
-        state: present
-        kind: template
-        files:
-        - "{{ template_dir }}/{{ openshift_cfme_flavor_short }}-template.yaml"
-
-######################################################################
-# EXTERNAL DATABASE TEMPLATE
-- when: openshift_cfme_app_template in ['miq-template-ext-db', 'cfme-template']
-  block:
-  - name: Check if the CFME Ext-DB Server template has been created already
-    oc_obj:
-      namespace: "{{ openshift_cfme_project }}"
-      state: list
-      kind: template
-      name: "{{ openshift_cfme_flavor }}-ext-db"
-    register: miq_ext_db_server_check
-
-  - when: miq_ext_db_server_check.results.results == [{}]
-    block:
-    - name: Copy over CFME Ext-DB Server template
-      copy:
-        src: "templates/{{ openshift_cfme_flavor }}/{{openshift_cfme_flavor_short}}-template-ext-db.yaml"
-        dest: "{{ template_dir }}/"
-
-    - name: Ensure CFME Ext-DB Server Template is created
-      oc_obj:
-        namespace: "{{ openshift_cfme_project }}"
-        name: "{{ openshift_cfme_flavor }}-ext-db"
-        state: present
-        kind: template
-        files:
-        - "{{ template_dir }}/{{ openshift_cfme_flavor_short }}-template-ext-db.yaml"
-
-# End app template creation.
-######################################################################
-
-######################################################################
-# Begin conditional PV template creations
-
-# Required for the application server
-- name: Check if the CFME App PV template has been created already
-  oc_obj:
-    namespace: "{{ openshift_cfme_project }}"
-    state: list
-    kind: template
-    name: "{{ openshift_cfme_flavor }}-app-pv"
-  register: miq_app_pv_check
-
-- when: miq_app_pv_check.results.results == [{}]
-  block:
-  - name: Copy over CFME App PV template
-    copy:
-      src: "templates/{{ openshift_cfme_flavor }}/{{ openshift_cfme_flavor_short }}-pv-server-example.yaml"
-      dest: "{{ template_dir }}/"
-
-  - name: Ensure CFME App PV Template is created
-    oc_obj:
-      namespace: "{{ openshift_cfme_project }}"
-      name: "{{ openshift_cfme_flavor }}-app-pv"
-      state: present
-      kind: template
-      files:
-      - "{{ template_dir }}/{{ openshift_cfme_flavor_short }}-pv-server-example.yaml"
-
-#---------------------------------------------------------------------
-
-# Required for database if the installation is fully podified
-- when: openshift_cfme_app_template in ['miq-template', 'cfme-template']
-  block:
-  - name: Check if the CFME DB PV template has been created already
-    oc_obj:
-      namespace: "{{ openshift_cfme_project }}"
-      state: list
-      kind: template
-      name: "{{ openshift_cfme_flavor }}-db-pv"
-    register: miq_db_pv_check
-
-  - when: miq_db_pv_check.results.results == [{}]
-    block:
-    - name: Copy over CFME DB PV template
-      copy:
-        src: "templates/{{ openshift_cfme_flavor }}/{{ openshift_cfme_flavor_short }}-pv-db-example.yaml"
-        dest: "{{ template_dir }}/"
-
-    - name: Ensure CFME DB PV Template is created
-      oc_obj:
-        namespace: "{{ openshift_cfme_project }}"
-        name: "{{ openshift_cfme_flavor }}-db-pv"
-        state: present
-        kind: template
-        files:
-        - "{{ template_dir }}/{{ openshift_cfme_flavor_short }}-pv-db-example.yaml"
diff --git a/roles/openshift_cfme/tasks/uninstall.yml b/roles/openshift_cfme/tasks/uninstall.yml
deleted file mode 100644
index 068d065c2..000000000
--- a/roles/openshift_cfme/tasks/uninstall.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- name: Start removing all the objects
-  command: "oc delete -n {{ openshift_cfme_project }} {{ item }} --all"
-  with_items:
-    - rc
-    - dc
-    - po
-    - svc
-    - pv
-    - pvc
-    - statefulsets
-    - routes
-
-- name: Remove the project
-  command: "oc delete -n {{ openshift_cfme_project }} project {{ openshift_cfme_project }}"
-
-- name: Verify project has been destroyed
-  command: "oc get project {{ openshift_cfme_project }}"
-  ignore_errors: True
-  register: project_terminated
-  until: project_terminated.stderr.find("NotFound") != -1
-  delay: 5
-  retries: 30
diff --git a/roles/openshift_cfme/tasks/validate.yml b/roles/openshift_cfme/tasks/validate.yml
deleted file mode 100644
index 1ba813a43..000000000
--- a/roles/openshift_cfme/tasks/validate.yml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-# Validate configuration parameters passed to the openshift_cfme role
-
-######################################################################
-# CORE PARAMETERS
-- name: Ensure openshift_cfme_app_template is valid
-  assert:
-    that:
-      - openshift_cfme_app_template in __openshift_cfme_app_templates
-
-    msg: |
-      "openshift_cfme_app_template must be one of {{
-      __openshift_cfme_app_templates | join(', ') }}"
-
-- name: Ensure openshift_cfme_storage_class is a valid type
-  assert:
-    that:
-      - openshift_cfme_storage_class in __openshift_cfme_storage_classes
-    msg: |
-      "openshift_cfme_storage_class must be one of {{
-      __openshift_cfme_storage_classes | join(', ') }}"
-
-######################################################################
-# STORAGE PARAMS - NFS
-- name: Ensure external NFS storage has a valid NFS server hostname defined
-  assert:
-    that:
-      - openshift_cfme_storage_nfs_external_hostname | default(False)
-    msg: |
-      The selected storage class 'nfs_external' requires a valid
-      hostname for the openshift_cfme_storage_nfs_hostname parameter
-  when:
-    - openshift_cfme_storage_class == 'nfs_external'
-
-- name: Ensure local NFS storage has a valid NFS server to use
-  fail:
-    msg: |
-      No NFS hosts detected or defined but storage class is set to
-      'nfs'. Add hosts to your [nfs] group or define one manually with
-      the 'openshift_cfme_storage_nfs_local_hostname' parameter
-  when:
-    - openshift_cfme_storage_class == 'nfs'
-    # You haven't created any NFS groups
-    - (groups.nfs is defined and groups.nfs | length == 0) or (groups.nfs is not defined)
-    # You did not manually specify a host to use
-    - (openshift_cfme_storage_nfs_local_hostname is not defined) or (openshift_cfme_storage_nfs_local_hostname == false)
-
-######################################################################
-# STORAGE PARAMS  -CLOUD PROVIDER
-- name: Validate Cloud Provider storage class
-  assert:
-    that:
-      - openshift_cloudprovider_kind == 'aws' or openshift_cloudprovider_kind == 'gce'
-    msg: |
-      openshift_cfme_storage_class is 'cloudprovider' but you have an
-      invalid kind defined, '{{ openshift_cloudprovider_kind }}'. See
-      'openshift_cloudprovider_kind' in the example inventories for
-      the required parameters for your selected cloud
-      provider. Working providers: 'aws' and 'gce'.
-  when:
-    - openshift_cfme_storage_class == 'cloudprovider'
-    - openshift_cloudprovider_kind is defined
-
-- name: Validate 'cloudprovider' Storage Class has required parameters defined
-  assert:
-    that:
-      - openshift_cloudprovider_kind is defined
-    msg: |
-      openshift_cfme_storage_class is 'cloudprovider' but you do not
-      have 'openshift_cloudprovider_kind' defined, this is
-      required. Search the example inventories for
-      'openshift_cloudprovider_kind'. The required parameters for your
-      selected cloud provider must be defined in your inventory as
-      well. Working providers: 'aws' and 'gce'.
-  when:
-    - openshift_cfme_storage_class == 'cloudprovider'
-
-######################################################################
-# DATABASE CONNECTION VALIDATION
-- name: Validate all required database parameters were provided for ext-db template
-  assert:
-    that:
-      - item in openshift_cfme_template_parameters
-    msg: |
-      "You are using external database services but a required
-      database parameter {{ item }} was not found in
-      'openshift_cfme_template_parameters'"
-  with_items: "{{ __openshift_cfme_required_db_conn_params }}"
-  when:
-    - openshift_cfme_app_template in ['miq-template-ext-db', 'cfme-template-ext-db']
diff --git a/roles/openshift_cfme/templates/openshift_cfme-miq-template-ext-db.exports.j2 b/roles/openshift_cfme/templates/openshift_cfme-miq-template-ext-db.exports.j2
deleted file mode 100644
index f43a93ba0..000000000
--- a/roles/openshift_cfme/templates/openshift_cfme-miq-template-ext-db.exports.j2
+++ /dev/null
@@ -1 +0,0 @@
-{{ openshift_cfme_storage_nfs_base_dir }}/{{ openshift_cfme_flavor_short }}-app *(rw,no_root_squash,no_wdelay)
diff --git a/roles/openshift_cfme/templates/openshift_cfme-miq-template.exports.j2 b/roles/openshift_cfme/templates/openshift_cfme-miq-template.exports.j2
deleted file mode 100644
index 4a4d85a23..000000000
--- a/roles/openshift_cfme/templates/openshift_cfme-miq-template.exports.j2
+++ /dev/null
@@ -1,2 +0,0 @@
-{{ openshift_cfme_storage_nfs_base_dir }}/{{ openshift_cfme_flavor_short }}-app *(rw,no_root_squash,no_wdelay)
-{{ openshift_cfme_storage_nfs_base_dir }}/{{ openshift_cfme_flavor_short }}-db *(rw,no_root_squash,no_wdelay)
diff --git a/roles/openshift_cfme/vars/main.yml b/roles/openshift_cfme/vars/main.yml
deleted file mode 100644
index 9764f464c..000000000
--- a/roles/openshift_cfme/vars/main.yml
+++ /dev/null
@@ -1,76 +0,0 @@
----
-# Misc enumerated values
-#---------------------------------------------------------------------
-# Allowed choices for the storage class parameter
-__openshift_cfme_storage_classes:
-  - nfs
-  - nfs_external
-  - preconfigured
-  - cloudprovider
-
-#---------------------------------------------------------------------
-# DEFAULT PV SIZES
-# How large to make the MIQ application PV
-__openshift_cfme_app_pv_size: 5Gi
-# How large to make the MIQ PostgreSQL PV
-__openshift_cfme_db_pv_size: 15Gi
-
-# Name of the application templates with object/parameter definitions
-__openshift_cfme_app_templates:
-  - miq-template-ext-db
-  - miq-template
-  - cfme-template-ext-db
-  - cfme-template
-
-# PostgreSQL database connection parameters
-__openshift_cfme_db_parameters:
-  - DATABASE_USER
-  - DATABASE_PASSWORD
-  - DATABASE_IP
-  - DATABASE_PORT
-  - DATABASE_NAME
-
-# # Commented out until we can support both CFME and MIQ
-# # openshift_cfme_flavor: "{{ 'cloudforms' if openshift_deployment_type == 'openshift-enterprise' else 'manageiq' }}"
-#openshift_cfme_flavor: cloudforms
-openshift_cfme_flavor: manageiq
-# TODO: Make this conditional as well based on the prior variable
-# # openshift_cfme_flavor_short: "{{ 'cfme' if openshift_deployment_type == 'openshift-enterprise' else 'miq' }}"
-# openshift_cfme_flavor_short: cfme
-openshift_cfme_flavor_short: miq
-
-######################################################################
-# ACCOUNTING
-######################################################################
-# Service Account SSCs
-__openshift_system_account_sccs:
-  - name: -anyuid
-    resource_name: anyuid
-  - name: -orchestrator
-    resource_name: anyuid
-  - name: -privileged
-    resource_name: privileged
-  - name: -httpd
-    resource_name: anyuid
-
-# Service Account Roles
-__openshift_cfme_system_account_roles:
-  - name: -orchestrator
-    resource_name: view
-  - name: -orchestrator
-    resource_name: edit
-
-######################################################################
-# DEFAULTS
-######################################################################
-# User only has to provide parameters they need to override, we will
-# do a hash update method with the provided user parameters to create
-# the final connection structure.
-#
-# TODO: Update user provided configs with this if they are missing fields
-__openshift_cfme_required_db_conn_params:
-  - DATABASE_USER
-  - DATABASE_PASSWORD
-  - DATABASE_IP
-  - DATABASE_PORT
-  - DATABASE_NAME