Merge pull request #1925 from sdodson/disconnected-image-streams

If registry_url != registry.access.redhat.com then modify image streams

playbooks/common/openshift-cluster/additional_config.yml

@@ -17,6 +17,7 @@
   - role: openshift_master_cluster
     when: openshift_master_ha | bool and openshift.master.cluster_method == "pacemaker"
   - role: openshift_examples
+    registry_url: "{{ openshift.master.registry_url }}"
     when: openshift.common.install_examples | bool
   - role: openshift_cluster_metrics
     when: openshift.common.use_cluster_metrics | bool

playbooks/common/openshift-cluster/upgrades/v3_0_minor/upgrade.yml

@@ -109,5 +109,6 @@
   vars:
     openshift_examples_import_command: "update"
     openshift_deployment_type: "{{ deployment_type }}"
+    registry_url: "{{ openshift.master.registry_url }}"
   roles:
     - openshift_examples

playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml

@@ -569,6 +569,7 @@
   # Update the existing templates
   - role: openshift_examples
     openshift_examples_import_command: replace
+    registry_url: "{{ openshift.master.registry_url }}"
   pre_tasks:
   - name: Collect all routers
     command: >

playbooks/common/openshift-cluster/upgrades/v3_1_minor/post.yml

@@ -19,6 +19,7 @@
   # Update the existing templates
   - role: openshift_examples
     openshift_examples_import_command: replace
+    registry_url: "{{ openshift.master.registry_url }}"
   pre_tasks:
   - name: Collect all routers
     command: >

playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/post.yml

@@ -19,6 +19,7 @@
   - openshift_examples
   # Update the existing templates
   - role: openshift_examples
+    registry_url: "{{ openshift.master.registry_url }}"
     openshift_examples_import_command: replace
   pre_tasks:
   - name: Collect all routers

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 '' }}"

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: >