diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-01 14:30:28 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2017-08-01 15:01:00 -0400 |
| commit | 4799271c6e7c75c304069aadf5e14cfe484f8c8b (patch) | |
| tree | 0c2818c251fea63f2d4225c84ff44f7d4d28d56d | |
| parent | bf0bf407479458206f48885e43d3e1d3a2eab6e1 (diff) | |
| download | openshift-4799271c6e7c75c304069aadf5e14cfe484f8c8b.tar.gz openshift-4799271c6e7c75c304069aadf5e14cfe484f8c8b.tar.bz2 openshift-4799271c6e7c75c304069aadf5e14cfe484f8c8b.tar.xz openshift-4799271c6e7c75c304069aadf5e14cfe484f8c8b.zip | |
Use enterprise images for CFME enterprise deployments
| -rw-r--r-- | roles/openshift_cfme/defaults/main.yml | 7 | ||||
| -rw-r--r-- | roles/openshift_cfme/tasks/main.yml | 7 |
2 files changed, 13 insertions, 1 deletions
diff --git a/roles/openshift_cfme/defaults/main.yml b/roles/openshift_cfme/defaults/main.yml index 493e1ef68..79e59b410 100644 --- a/roles/openshift_cfme/defaults/main.yml +++ b/roles/openshift_cfme/defaults/main.yml @@ -35,4 +35,9 @@ openshift_cfme_nfs_server: "{{ groups.nfs.0 }}" # --template=manageiq). If False everything UP TO 'new-app' is ran. openshift_cfme_install_app: False # Docker image to pull -openshift_cfme_container_image: "docker.io/manageiq/manageiq-pods:app-latest-fine" +openshift_cfme_application_img_name: "{{ 'registry.access.redhat.com/cloudforms45/cfme-openshift-app' if openshift_deployment_type == 'openshift-enterprise' else 'docker.io/manageiq/manageiq-pods:app-latest-fine' }}" +openshift_cfme_postgresql_img_name: "{{ 'registry.access.redhat.com/cloudforms45/cfme-openshift-postgresql' if openshift_deployment_type == 'openshift-enterprise' else 'docker.io/manageiq/manageiq-pods:app-latest-fine' }}" +openshift_cfme_memcached_img_name: "{{ 'registry.access.redhat.com/cloudforms45/cfme-openshift-memcached' if openshift_deployment_type == 'openshift-enterprise' else 'docker.io/manageiq/manageiq-pods:app-latest-fine' }}" +openshift_cfme_application_img_tag: "{{ 'latest' if openshift_deployment_type == 'openshift-enterprise' else 'app-latest-fine' }}" +openshift_cfme_memcached_img_tag: "{{ 'latest' if openshift_deployment_type == 'openshift-enterprise' else 'memcached-latest-fine' }}" +openshift_cfme_postgresql_img_tag: "{{ 'latest' if openshift_deployment_type == 'openshift-enterprise' else 'postgresql-latest-fine' }}" diff --git a/roles/openshift_cfme/tasks/main.yml b/roles/openshift_cfme/tasks/main.yml index acbce7232..3325ee4a7 100644 --- a/roles/openshift_cfme/tasks/main.yml +++ b/roles/openshift_cfme/tasks/main.yml @@ -110,6 +110,13 @@ namespace: "{{ openshift_cfme_project }}" template_name: manageiq create: True + params: + APPLICATION_IMG_NAME: "{{ openshift_cfme_application_img_name }}" + POSTGRESQL_IMG_NAME: "{{ openshift_cfme_postgresql_img_name }}" + MEMCACHED_IMG_NAME: "{{ openshift_cfme_memcached_img_name }}" + APPLICATION_IMG_TAG: "{{ openshift_cfme_application_img_tag }}" + POSTGRESQL_IMG_TAG: "{{ openshift_cfme_postgresql_img_tag }}" + MEMCACHED_IMG_TAG: "{{ openshift_cfme_memcached_img_tag }}" register: cfme_new_app_process run_once: True when: |