diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-08 10:16:42 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-08 10:16:42 -0300 |
| commit | 7480a0e06a9a1da029c6564e1e4d7ef60131e6e2 (patch) | |
| tree | 731b1c213bed675608c6e76452a0d4ed415f4416 /inventory | |
| parent | c1728c8847177988e4532b9c9c777e1a23223410 (diff) | |
| parent | 6ec757e4449fbc59f509f980bd9423bdb35412eb (diff) | |
| download | openshift-7480a0e06a9a1da029c6564e1e4d7ef60131e6e2.tar.gz openshift-7480a0e06a9a1da029c6564e1e4d7ef60131e6e2.tar.bz2 openshift-7480a0e06a9a1da029c6564e1e4d7ef60131e6e2.tar.xz openshift-7480a0e06a9a1da029c6564e1e4d7ef60131e6e2.zip | |
Merge branch 'aoi-32-up' into upgrade33
Diffstat (limited to 'inventory')
| -rw-r--r-- | inventory/byo/hosts.aep.example | 3 | ||||
| -rw-r--r-- | inventory/byo/hosts.origin.example | 4 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/inventory/byo/hosts.aep.example b/inventory/byo/hosts.aep.example index 7f3f7ee50..c1d59fc41 100644 --- a/inventory/byo/hosts.aep.example +++ b/inventory/byo/hosts.aep.example @@ -103,6 +103,9 @@ openshift_release=v3.2 # only need to inject your own registry you may want to consider # openshift_docker_additional_registries instead #oreg_url=example.com/aep3/aep-${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 # Additional yum repos to install #openshift_additional_repos=[{'id': 'aep-devel', 'name': 'aep-devel', 'baseurl': 'http://example.com/puddle/build/AtomicOpenShift/3.1/latest/RH7-RHOSE-3.0/$basearch/os', 'enabled': 1, 'gpgcheck': 0}] diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 14880e54a..242113a6b 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -104,6 +104,10 @@ openshift_release=v1.2 # only need to inject your own registry you may want to consider # openshift_docker_additional_registries instead #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 + # Origin copr repo #openshift_additional_repos=[{'id': 'openshift-origin-copr', 'name': 'OpenShift Origin COPR', 'baseurl': 'https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/epel-7-$basearch/', 'enabled': 1, 'gpgcheck': 1, 'gpgkey': 'https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/pubkey.gpg'}] diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index f19a5e592..fec41889a 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -103,6 +103,9 @@ openshift_release=v3.2 # only need to inject your own registry you may want to consider # openshift_docker_additional_registries instead #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 # 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}] |