summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-11-24 18:15:53 -0500
committerGitHub <noreply@github.com>2017-11-24 18:15:53 -0500
commit1ef463e727e202ba7595976f0478110b3b7585d0 (patch)
tree54d1d1c837bd7b4aa7e62533a0ce154a2d91e39d /playbooks
parent0338debbd35254c884487ceb1064b1eabde0149e (diff)
parent3e1488493484d64e7448c468dd840aa03ed617c8 (diff)
downloadopenshift-1ef463e727e202ba7595976f0478110b3b7585d0.tar.gz
openshift-1ef463e727e202ba7595976f0478110b3b7585d0.tar.bz2
openshift-1ef463e727e202ba7595976f0478110b3b7585d0.tar.xz
openshift-1ef463e727e202ba7595976f0478110b3b7585d0.zip
Merge pull request #6134 from fraenkel/allow_false
Allow openshift_install_examples to be false
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/post_control_plane.yml4
-rw-r--r--playbooks/openshift-master/private/additional_config.yml2
2 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
index c634e0ab8..3aa9e0460 100644
--- a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
@@ -93,11 +93,11 @@
# not already exist. We could have potentially done a replace --force to
# create and update in one step.
- role: openshift_examples
- when: openshift_install_examples | default(true,true) | bool
+ when: openshift_install_examples | default(true) | bool
- openshift_hosted_templates
# Update the existing templates
- role: openshift_examples
- when: openshift_install_examples | default(true,true) | bool
+ when: openshift_install_examples | default(true) | bool
registry_url: "{{ openshift.master.registry_url }}"
openshift_examples_import_command: replace
- role: openshift_hosted_templates
diff --git a/playbooks/openshift-master/private/additional_config.yml b/playbooks/openshift-master/private/additional_config.yml
index 32f638d42..b7cfbe4e4 100644
--- a/playbooks/openshift-master/private/additional_config.yml
+++ b/playbooks/openshift-master/private/additional_config.yml
@@ -24,7 +24,7 @@
- role: openshift_project_request_template
when: openshift_project_request_template_manage
- role: openshift_examples
- when: openshift_install_examples | default(true, true) | bool
+ when: openshift_install_examples | default(true) | bool
registry_url: "{{ openshift.master.registry_url }}"
- role: openshift_hosted_templates
registry_url: "{{ openshift.master.registry_url }}"