diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-16 14:46:22 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-16 14:46:22 -0800 |
| commit | bd289432c9b6e8b0b0a63f1f8b742e023e4b2fb8 (patch) | |
| tree | 53770f48bba470fb0417d52e84d1813d18c9c3d5 /roles/cockpit-ui | |
| parent | 78a5a599bf23c8cdd46079793fd1597a6fa7223d (diff) | |
| parent | a80dab78b05b21393587fc99a73e61e6450dddf7 (diff) | |
| download | openshift-bd289432c9b6e8b0b0a63f1f8b742e023e4b2fb8.tar.gz openshift-bd289432c9b6e8b0b0a63f1f8b742e023e4b2fb8.tar.bz2 openshift-bd289432c9b6e8b0b0a63f1f8b742e023e4b2fb8.tar.xz openshift-bd289432c9b6e8b0b0a63f1f8b742e023e4b2fb8.zip | |
Merge pull request #6114 from sosiouxme/20171114-registry-console-tech-debt
Automatic merge from submit-queue.
registry-console tech debt
Followup to https://github.com/openshift/openshift-ansible/pull/5829
Replaces https://github.com/openshift/openshift-ansible/pull/6093
Fixes the construction and checking of registry-console images to be as similar as it can get to those constructed from the traditional `oreg_url` without tacking on `ose-` or `origin-` to the base name.
I did not see a reason for having `registry.access.redhat.com/` as a hardcoded enterprise default so I took it out. Someone say something if there was a good reason for this.
Diffstat (limited to 'roles/cockpit-ui')
| -rw-r--r-- | roles/cockpit-ui/tasks/main.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/cockpit-ui/tasks/main.yml b/roles/cockpit-ui/tasks/main.yml index 09f4259a2..f60912033 100644 --- a/roles/cockpit-ui/tasks/main.yml +++ b/roles/cockpit-ui/tasks/main.yml @@ -41,6 +41,7 @@ command: > {{ openshift.common.client_binary }} new-app --template=registry-console {% if openshift_cockpit_deployer_prefix is defined %}-p IMAGE_PREFIX="{{ openshift_cockpit_deployer_prefix }}"{% endif %} + {% if openshift_cockpit_deployer_basename is defined %}-p IMAGE_BASENAME="{{ openshift_cockpit_deployer_basename }}"{% endif %} {% if openshift_cockpit_deployer_version is defined %}-p IMAGE_VERSION="{{ openshift_cockpit_deployer_version }}"{% endif %} -p OPENSHIFT_OAUTH_PROVIDER_URL="{{ openshift.master.public_api_url }}" -p REGISTRY_HOST="{{ docker_registry_route.results[0].spec.host }}" |