summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-08-02 10:41:23 -0400
committerGitHub <noreply@github.com>2017-08-02 10:41:23 -0400
commitf6e0126c3cda6622fc2371b3b603108b94ed9d39 (patch)
tree40dae6081c5419e9ba4f55e09b2867cd5dd825ea /roles
parentd50e8865ffead8ae913e52a2892824687245fd63 (diff)
parent4799271c6e7c75c304069aadf5e14cfe484f8c8b (diff)
downloadopenshift-f6e0126c3cda6622fc2371b3b603108b94ed9d39.tar.gz
openshift-f6e0126c3cda6622fc2371b3b603108b94ed9d39.tar.bz2
openshift-f6e0126c3cda6622fc2371b3b603108b94ed9d39.tar.xz
openshift-f6e0126c3cda6622fc2371b3b603108b94ed9d39.zip
Merge pull request #4968 from sdodson/cfme-images
Merged by openshift-bot
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_cfme/defaults/main.yml7
-rw-r--r--roles/openshift_cfme/tasks/main.yml7
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: