diff options
| author | Michael Fraenkel <michael.fraenkel@gmail.com> | 2017-11-15 22:03:56 -0500 |
|---|---|---|
| committer | Michael Fraenkel <michael.fraenkel@gmail.com> | 2017-11-22 23:14:02 -0500 |
| commit | 3e1488493484d64e7448c468dd840aa03ed617c8 (patch) | |
| tree | 660f2849d81c2af405bc95252df87d9e112a0216 | |
| parent | d2853aeb1c5afc67d0cc27a91c093f1e737e654a (diff) | |
| download | openshift-3e1488493484d64e7448c468dd840aa03ed617c8.tar.gz openshift-3e1488493484d64e7448c468dd840aa03ed617c8.tar.bz2 openshift-3e1488493484d64e7448c468dd840aa03ed617c8.tar.xz openshift-3e1488493484d64e7448c468dd840aa03ed617c8.zip | |
Allow openshift_install_examples to be false
when using yaml or json, a false value is converted to true
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/post_control_plane.yml | 4 | ||||
| -rw-r--r-- | playbooks/openshift-master/private/additional_config.yml | 2 |
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 }}" |