diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-06-17 13:42:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-17 13:42:10 -0400 |
| commit | 4597740a002236c70d45829bc22e0d0d126a0cbd (patch) | |
| tree | 8e424b41781f1bd041e0816c05b78c55abadfb24 /roles | |
| parent | 5c095116ff23ee1ccbe6ba0407cff0fb05d9980d (diff) | |
| parent | ed28e9a5929aaa305d5d9db38da96887184b3338 (diff) | |
| download | openshift-4597740a002236c70d45829bc22e0d0d126a0cbd.tar.gz openshift-4597740a002236c70d45829bc22e0d0d126a0cbd.tar.bz2 openshift-4597740a002236c70d45829bc22e0d0d126a0cbd.tar.xz openshift-4597740a002236c70d45829bc22e0d0d126a0cbd.zip | |
Merge pull request #1925 from sdodson/disconnected-image-streams
If registry_url != registry.access.redhat.com then modify image streams
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_examples/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_examples/tasks/main.yml | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/roles/openshift_examples/defaults/main.yml b/roles/openshift_examples/defaults/main.yml index 976ff7702..d88014bea 100644 --- a/roles/openshift_examples/defaults/main.yml +++ b/roles/openshift_examples/defaults/main.yml @@ -20,3 +20,5 @@ infrastructure_origin_base: "{{ examples_base }}/infrastructure-templates/origin infrastructure_enterprise_base: "{{ examples_base }}/infrastructure-templates/enterprise" openshift_examples_import_command: "create" +registry_url: "" +registry_host: "{{ registry_url.split('/')[0] if '.' in registry_url.split('/')[0] else '' }}"
\ No newline at end of file diff --git a/roles/openshift_examples/tasks/main.yml b/roles/openshift_examples/tasks/main.yml index a5731be09..fb10188f2 100644 --- a/roles/openshift_examples/tasks/main.yml +++ b/roles/openshift_examples/tasks/main.yml @@ -4,6 +4,11 @@ src: "examples/{{ content_version }}/" dest: "{{ examples_base }}/" +- 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 != '' + # RHEL and Centos image streams are mutually exclusive - name: Import RHEL streams command: > |