summaryrefslogtreecommitdiffstats
path: root/inventory/byo/hosts.example
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-11-08 15:14:34 -0500
committerGitHub <noreply@github.com>2017-11-08 15:14:34 -0500
commit52d2eb56e3198ed83c7c9a912aa22919e2180985 (patch)
tree8fd448c42e7cbe412231b9c6407e1690ae82f47b /inventory/byo/hosts.example
parent4c80a74d3c8e0ed8a164cf805d88285e265be790 (diff)
parent37812f0da8f72df9108bfdcd882439d3faeea79b (diff)
downloadopenshift-52d2eb56e3198ed83c7c9a912aa22919e2180985.tar.gz
openshift-52d2eb56e3198ed83c7c9a912aa22919e2180985.tar.bz2
openshift-52d2eb56e3198ed83c7c9a912aa22919e2180985.tar.xz
openshift-52d2eb56e3198ed83c7c9a912aa22919e2180985.zip
Merge pull request #5829 from sosiouxme/20171020-registry-console-bz1497310
reconcile registry-console and docker_image_availability
Diffstat (limited to 'inventory/byo/hosts.example')
-rw-r--r--inventory/byo/hosts.example7
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