From ed28e9a5929aaa305d5d9db38da96887184b3338 Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Thu, 19 May 2016 11:17:32 -0400
Subject: If registry_url != registry.access.redhat.com then modify image
 streams

---
 playbooks/common/openshift-cluster/additional_config.yml             | 1 +
 playbooks/common/openshift-cluster/upgrades/v3_0_minor/upgrade.yml   | 1 +
 playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml | 1 +
 playbooks/common/openshift-cluster/upgrades/v3_1_minor/post.yml      | 1 +
 playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/post.yml    | 1 +
 5 files changed, 5 insertions(+)

(limited to 'playbooks/common')

diff --git a/playbooks/common/openshift-cluster/additional_config.yml b/playbooks/common/openshift-cluster/additional_config.yml
index ebddc7841..a34322754 100644
--- a/playbooks/common/openshift-cluster/additional_config.yml
+++ b/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
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_0_minor/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_0_minor/upgrade.yml
index 5b2bf9f93..e31e7f8a3 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_0_minor/upgrade.yml
+++ b/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
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
index 3a4c58e43..c3c1240d8 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
+++ b/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: >
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_minor/post.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_minor/post.yml
index 196393b2a..f030eed18 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_1_minor/post.yml
+++ b/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: >
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/post.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/post.yml
index 31e76805c..c16965a35 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/post.yml
+++ b/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
-- 
cgit v1.2.3