diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-09-22 11:51:23 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2017-09-22 14:06:59 -0400 |
| commit | 95b7ffbb4a65ca62af37192aaf8006f50a207440 (patch) | |
| tree | 35347d3b745a2a06688a112171cba0caf2dd8f75 | |
| parent | 5b1bb00a2f02e51ab493e86eb4d8b6e264e3268d (diff) | |
| download | openshift-95b7ffbb4a65ca62af37192aaf8006f50a207440.tar.gz openshift-95b7ffbb4a65ca62af37192aaf8006f50a207440.tar.bz2 openshift-95b7ffbb4a65ca62af37192aaf8006f50a207440.tar.xz openshift-95b7ffbb4a65ca62af37192aaf8006f50a207440.zip | |
Allow examples management to be disabled
| -rw-r--r-- | inventory/byo/hosts.ose.example | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/post_control_plane.yml | 4 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/additional_config.yml | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 9dd76a355..bea479165 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -60,7 +60,7 @@ openshift_release=v3.7 # In either case, system_images_registry must be specified to be able to find the system images #system_images_registry="registry.access.redhat.com" -# Install the openshift examples +# Manage openshift example imagestreams and templates during install and upgrade #openshift_install_examples=true # Configure logoutURL in the master config for console customization 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 diff --git a/playbooks/common/openshift-master/additional_config.yml b/playbooks/common/openshift-master/additional_config.yml index de467a722..1ce1ac2f3 100644 --- a/playbooks/common/openshift-master/additional_config.yml +++ b/playbooks/common/openshift-master/additional_config.yml @@ -10,8 +10,8 @@ - role: openshift_master_cluster when: openshift_master_ha | bool and openshift.master.cluster_method == "pacemaker" - role: openshift_examples + when: openshift_install_examples | default(true, true) | bool registry_url: "{{ openshift.master.registry_url }}" - when: openshift_install_examples | default(True) - role: openshift_hosted_templates registry_url: "{{ openshift.master.registry_url }}" - role: openshift_manageiq |