diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-09-01 14:52:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-01 14:52:28 -0400 |
| commit | 1b146b956a8c3f8395ed68807443019120f127fa (patch) | |
| tree | f4274be4a45ce2afacf82d3c6fe30e7b8d6532e1 /inventory | |
| parent | 7d79b61c55dd941dfe2533679ba37b67704a2c23 (diff) | |
| parent | 75e78c3b33dd47cedbc30416df7f559f233df511 (diff) | |
| download | openshift-1b146b956a8c3f8395ed68807443019120f127fa.tar.gz openshift-1b146b956a8c3f8395ed68807443019120f127fa.tar.bz2 openshift-1b146b956a8c3f8395ed68807443019120f127fa.tar.xz openshift-1b146b956a8c3f8395ed68807443019120f127fa.zip | |
Merge pull request #2365 from sdodson/dont-use-additional-registry
Don't advise people to use additional registries over oreg_url
Diffstat (limited to 'inventory')
| -rw-r--r-- | inventory/byo/hosts.origin.example | 6 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 4124ecb31..b32eb5c18 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -93,13 +93,11 @@ openshift_release=v1.2 # Skip upgrading Docker during an OpenShift upgrade, leaves the current Docker version alone. # docker_upgrade=False -# Alternate image format string. If you're not modifying the format string and -# only need to inject your own registry you may want to consider -# openshift_docker_additional_registries instead +# Alternate image format string, useful if you've got your own registry mirror #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 -#openshift_examples_modify_imagestreams=True +#openshift_examples_modify_imagestreams=true # Origin copr repo diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index b617d2a03..5aaf6695a 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -93,13 +93,11 @@ openshift_release=v3.2 # Skip upgrading Docker during an OpenShift upgrade, leaves the current Docker version alone. # docker_upgrade=False -# Alternate image format string. If you're not modifying the format string and -# only need to inject your own registry you may want to consider -# openshift_docker_additional_registries instead +# Alternate image format string, useful if you've got your own registry mirror #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 -#openshift_examples_modify_imagestreams=True +#openshift_examples_modify_imagestreams=true # Additional yum repos to install #openshift_additional_repos=[{'id': 'ose-devel', 'name': 'ose-devel', 'baseurl': 'http://example.com/puddle/build/AtomicOpenShift/3.1/latest/RH7-RHOSE-3.0/$basearch/os', 'enabled': 1, 'gpgcheck': 0}] |