diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-05 11:03:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-05 11:03:47 -0400 |
| commit | 6bddc67edcf70cec619c7d89ffd25a7336fece9a (patch) | |
| tree | b410a4017b26dd91820863505f22e2a97f919c70 | |
| parent | 3c15d29e2eec5dd5f5022706220f249bc3dfb245 (diff) | |
| parent | 63673919ae66cd0d963f46a3fe9c5f0c92a1331a (diff) | |
| download | openshift-6bddc67edcf70cec619c7d89ffd25a7336fece9a.tar.gz openshift-6bddc67edcf70cec619c7d89ffd25a7336fece9a.tar.bz2 openshift-6bddc67edcf70cec619c7d89ffd25a7336fece9a.tar.xz openshift-6bddc67edcf70cec619c7d89ffd25a7336fece9a.zip | |
Merge pull request #2085 from sdodson/is-munging
Make image stream munging optional
| -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 | ||||
| -rw-r--r-- | roles/openshift_examples/tasks/main.yml | 2 |
4 files changed, 11 insertions, 1 deletions
diff --git a/inventory/byo/hosts.aep.example b/inventory/byo/hosts.aep.example index cddd5175c..34b57e4a6 100644 --- a/inventory/byo/hosts.aep.example +++ b/inventory/byo/hosts.aep.example @@ -79,6 +79,9 @@ deployment_type=atomic-enterprise # 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 9cb6b3740..009731777 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -80,6 +80,10 @@ deployment_type=origin # 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 b4c6ff9b5..a599882f5 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -79,6 +79,9 @@ deployment_type=openshift-enterprise # 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}] diff --git a/roles/openshift_examples/tasks/main.yml b/roles/openshift_examples/tasks/main.yml index fb10188f2..4dc4cfb56 100644 --- a/roles/openshift_examples/tasks/main.yml +++ b/roles/openshift_examples/tasks/main.yml @@ -7,7 +7,7 @@ - name: Modify registry paths if registry_url is not registry.access.redhat.com shell: > find {{ examples_base }} -type f | xargs -n 1 sed -i 's|registry.access.redhat.com|{{ registry_host | quote }}|g' - when: registry_host != '' + when: registry_host != '' and openshift_examples_modify_imagestreams | default(False) | bool # RHEL and Centos image streams are mutually exclusive - name: Import RHEL streams |