diff options
| author | Luke Meyer <lmeyer@redhat.com> | 2017-10-20 13:12:26 -0400 |
|---|---|---|
| committer | Luke Meyer <lmeyer@redhat.com> | 2017-11-06 14:37:03 -0500 |
| commit | 37812f0da8f72df9108bfdcd882439d3faeea79b (patch) | |
| tree | 55e26a77dc044bdb464a0bcb2660066641212630 /inventory | |
| parent | 5efcf4a2f7e9c2f21c6f9f86dc08f12fd5f56290 (diff) | |
| download | openshift-37812f0da8f72df9108bfdcd882439d3faeea79b.tar.gz openshift-37812f0da8f72df9108bfdcd882439d3faeea79b.tar.bz2 openshift-37812f0da8f72df9108bfdcd882439d3faeea79b.tar.xz openshift-37812f0da8f72df9108bfdcd882439d3faeea79b.zip | |
reconcile registry-console and docker_image_availability
Fixes bug 1497310
https://bugzilla.redhat.com/show_bug.cgi?id=1497310
The registry console is a special case in more than one way. This adds
logic to incorporate the openshift_cockpit_deployer_* variables into
determining what its image will be in docker_image_availability.
Along the way I noticed the origin and enterprise templates for this
were not consistent. Now they are, and the example hosts file is updated.
Diffstat (limited to 'inventory')
| -rw-r--r-- | inventory/byo/hosts.example | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/inventory/byo/hosts.example b/inventory/byo/hosts.example index 5de43270e..fbe0a97c5 100644 --- a/inventory/byo/hosts.example +++ b/inventory/byo/hosts.example @@ -400,10 +400,11 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', #openshift_hosted_routers=[{'name': 'router1', 'certificate': {'certfile': '/path/to/certificate/abc.crt', 'keyfile': '/path/to/certificate/abc.key', 'cafile': '/path/to/certificate/ca.crt'}, 'replicas': 1, 'serviceaccount': 'router', 'namespace': 'default', 'stats_port': 1936, 'edits': [], 'images': 'openshift3/ose-${component}:${version}', 'selector': 'type=router1', 'ports': ['80:80', '443:443']}, {'name': 'router2', 'certificate': {'certfile': '/path/to/certificate/xyz.crt', 'keyfile': '/path/to/certificate/xyz.key', 'cafile': '/path/to/certificate/ca.crt'}, 'replicas': 1, 'serviceaccount': 'router', 'namespace': 'default', 'stats_port': 1936, 'edits': [{'action': 'append', 'key': 'spec.template.spec.containers[0].env', 'value': {'name': 'ROUTE_LABELS', 'value': 'route=external'}}], 'images': 'openshift3/ose-${component}:${version}', 'selector': 'type=router2', 'ports': ['80:80', '443:443']}] # OpenShift Registry Console Options -# Override the console image prefix for enterprise deployments, not used in origin -# default is "registry.access.redhat.com/openshift3/" and the image appended is "registry-console" +# 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" #openshift_cockpit_deployer_prefix=registry.example.com/myrepo/ -# Override image version, defaults to latest for origin, matches the product version for enterprise +# Override image version, defaults to latest for origin, vX.Y product version for enterprise #openshift_cockpit_deployer_version=1.4.1 # Openshift Registry Options |