diff options
author | Tobias Brunner <tobias@tobru.ch> | 2017-05-19 13:27:50 +0200 |
---|---|---|
committer | Scott Dodson <sdodson@redhat.com> | 2017-05-19 09:42:45 -0400 |
commit | 0ee812822a5fe5ba7cc00d00c58744104c2d9fee (patch) | |
tree | 506bde2bc0480c8a3ff9cdc15371612806fd2642 /inventory | |
parent | b61044dfa3669d79bd5e99c846ad4d10de172583 (diff) | |
download | openshift-0ee812822a5fe5ba7cc00d00c58744104c2d9fee.tar.gz openshift-0ee812822a5fe5ba7cc00d00c58744104c2d9fee.tar.bz2 openshift-0ee812822a5fe5ba7cc00d00c58744104c2d9fee.tar.xz openshift-0ee812822a5fe5ba7cc00d00c58744104c2d9fee.zip |
allow to configure oreg_url specifically for node or master. refs #4233
This commit allows to specify imageConfig.format specifically for master
or for nodes.
One use case of this could be if you want to use customer builder
images. In this case imageConfig.format only needs to be changed in the
master-config.yml but not in the node-config.yml.
Diffstat (limited to 'inventory')
-rw-r--r-- | inventory/byo/hosts.origin.example | 4 | ||||
-rw-r--r-- | inventory/byo/hosts.ose.example | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 20f342023..f8d40fe23 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 f75a47bb8..21d7f01ec 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 |