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 /inventory | |
| 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 'inventory')
| -rw-r--r-- | inventory/byo/hosts.example | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/inventory/byo/hosts.example b/inventory/byo/hosts.example index 1a9a5b6cf..ccdec2da1 100644 --- a/inventory/byo/hosts.example +++ b/inventory/byo/hosts.example @@ -401,9 +401,10 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # OpenShift Registry Console Options # Override the console image prefix: -# origin default is "cockpit/" and the image appended is "kubernetes" -# enterprise default is "registry.access.redhat.com/openshift3/" and the image appended is "registry-console" +# origin default is "cockpit/", enterprise default is "openshift3/" #openshift_cockpit_deployer_prefix=registry.example.com/myrepo/ +# origin default is "kubernetes", enterprise default is "registry-console" +#openshift_cockpit_deployer_basename=my-console # Override image version, defaults to latest for origin, vX.Y product version for enterprise #openshift_cockpit_deployer_version=1.4.1 |