summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster/upgrades
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-09-28 08:06:02 -0700
committerGitHub <noreply@github.com>2017-09-28 08:06:02 -0700
commit4c1283b13e32d91f14a10ccb45c9d98a90a64c71 (patch)
treefbea8cb13e7f6425ed7600717a46400410961813 /playbooks/common/openshift-cluster/upgrades
parent6f43fc3572d8192e4a34aca9898369f9021dedaa (diff)
parent95b7ffbb4a65ca62af37192aaf8006f50a207440 (diff)
downloadopenshift-4c1283b13e32d91f14a10ccb45c9d98a90a64c71.tar.gz
openshift-4c1283b13e32d91f14a10ccb45c9d98a90a64c71.tar.bz2
openshift-4c1283b13e32d91f14a10ccb45c9d98a90a64c71.tar.xz
openshift-4c1283b13e32d91f14a10ccb45c9d98a90a64c71.zip
Merge pull request #5508 from sdodson/disable-image-streams
Automatic merge from submit-queue. Allow examples management to be disabled By setting openshift_install_examples=false the image stream and quick start templates will not be installed https://trello.com/c/zLaSgxig/436-2-customers-need-a-way-to-opt-out-of-openshift-ansible-template-and-imagestream-mangement Fixes #5061
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/post_control_plane.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
index d9ddf3860..07e521a89 100644
--- a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
@@ -90,10 +90,12 @@
# openshift_examples from failing when trying to replace templates that do
# not already exist. We could have potentially done a replace --force to
# create and update in one step.
- - openshift_examples
+ - role: openshift_examples
+ when: openshift_install_examples | default(true,true) | bool
- openshift_hosted_templates
# Update the existing templates
- role: openshift_examples
+ when: openshift_install_examples | default(true,true) | bool
registry_url: "{{ openshift.master.registry_url }}"
openshift_examples_import_command: replace
- role: openshift_hosted_templates