summaryrefslogtreecommitdiffstats
path: root/inventory/byo
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-05-26 19:10:39 -0500
committerGitHub <noreply@github.com>2017-05-26 19:10:39 -0500
commitc5f4a60fdd9ebc81180a96677717ca96b9badc72 (patch)
tree65ad8f8384f37ea8f57faa165ddf5391680f7633 /inventory/byo
parent670ee735410691c5e2f2709aa17bb2e8e5be3e84 (diff)
parent0ee812822a5fe5ba7cc00d00c58744104c2d9fee (diff)
downloadopenshift-c5f4a60fdd9ebc81180a96677717ca96b9badc72.tar.gz
openshift-c5f4a60fdd9ebc81180a96677717ca96b9badc72.tar.bz2
openshift-c5f4a60fdd9ebc81180a96677717ca96b9badc72.tar.xz
openshift-c5f4a60fdd9ebc81180a96677717ca96b9badc72.zip
Merge pull request #4234 from vshn/feature/oreg_url_masternode
Merged by openshift-bot
Diffstat (limited to 'inventory/byo')
-rw-r--r--inventory/byo/hosts.origin.example4
-rw-r--r--inventory/byo/hosts.ose.example5
2 files changed, 8 insertions, 1 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index d52036930..5d21f8e14 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -127,6 +127,10 @@ openshift_release=v3.6
# Alternate image format string, useful if you've got your own registry mirror
+# Configure this setting just on node or master
+#oreg_url_master=example.com/openshift3/ose-${component}:${version}
+#oreg_url_node=example.com/openshift3/ose-${component}:${version}
+# For setting the configuration globally
#oreg_url=example.com/openshift3/ose-${component}:${version}
# If oreg_url points to a registry other than registry.access.redhat.com we can
# modify image streams to point at that registry by setting the following to true
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example
index 647dd3d9a..662df8104 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -125,8 +125,11 @@ openshift_release=v3.6
# Tasks to run after each master is upgraded and system/services have been restarted.
# openshift_master_upgrade_post_hook=/usr/share/custom/post_master.yml
-
# Alternate image format string, useful if you've got your own registry mirror
+# Configure this setting just on node or master
+#oreg_url_master=example.com/openshift3/ose-${component}:${version}
+#oreg_url_node=example.com/openshift3/ose-${component}:${version}
+# For setting the configuration globally
#oreg_url=example.com/openshift3/ose-${component}:${version}
# If oreg_url points to a registry other than registry.access.redhat.com we can
# modify image streams to point at that registry by setting the following to true