diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-14 08:51:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-14 08:51:52 -0400 |
| commit | e4fc73cc110d4bf29fccc2481db0d2a32729ab28 (patch) | |
| tree | 6e5561a8a12a30157d8261ba0d757c15e03333c9 /roles/openshift_cfme | |
| parent | 187c8805fcc1bb021481e1aa7768e68b49334166 (diff) | |
| parent | 5362897571b550749c074c39e8eb0a4464f3d703 (diff) | |
| download | openshift-e4fc73cc110d4bf29fccc2481db0d2a32729ab28.tar.gz openshift-e4fc73cc110d4bf29fccc2481db0d2a32729ab28.tar.bz2 openshift-e4fc73cc110d4bf29fccc2481db0d2a32729ab28.tar.xz openshift-e4fc73cc110d4bf29fccc2481db0d2a32729ab28.zip | |
Merge pull request #5078 from jkaurredhat/cfme-1.7
Default values for CFME container images are invalid
Diffstat (limited to 'roles/openshift_cfme')
| -rw-r--r-- | roles/openshift_cfme/defaults/main.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_cfme/defaults/main.yml b/roles/openshift_cfme/defaults/main.yml index 79e59b410..27ed57703 100644 --- a/roles/openshift_cfme/defaults/main.yml +++ b/roles/openshift_cfme/defaults/main.yml @@ -35,9 +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_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_name: "{{ 'registry.access.redhat.com/cloudforms45/cfme-openshift-app' if openshift_deployment_type == 'openshift-enterprise' else 'docker.io/manageiq/manageiq-pods' }}" +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' }}" +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' }}" 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' }}" |