diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-28 08:06:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-28 08:06:02 -0700 |
| commit | 4c1283b13e32d91f14a10ccb45c9d98a90a64c71 (patch) | |
| tree | fbea8cb13e7f6425ed7600717a46400410961813 | |
| parent | 6f43fc3572d8192e4a34aca9898369f9021dedaa (diff) | |
| parent | 95b7ffbb4a65ca62af37192aaf8006f50a207440 (diff) | |
| download | openshift-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
| -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 e4f7609b3..03fbcc63c 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 e9e9a0b5b..ee76e2ed7 100644 --- a/playbooks/common/openshift-master/additional_config.yml +++ b/playbooks/common/openshift-master/additional_config.yml @@ -21,8 +21,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 |