diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-03 07:30:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-03 07:30:29 -0700 |
| commit | c99bfde17bca322e8a89ba3e9dc4e4fdc2776448 (patch) | |
| tree | c6e36f2b07ee6699e50065bb55f5d0e41da0a1fc /playbooks | |
| parent | 1b24db1dfb82b2b99605fdfc016c59161981d487 (diff) | |
| parent | b88adec6c15157c2894ccfe2ac855e67fb48ca33 (diff) | |
| download | openshift-c99bfde17bca322e8a89ba3e9dc4e4fdc2776448.tar.gz openshift-c99bfde17bca322e8a89ba3e9dc4e4fdc2776448.tar.bz2 openshift-c99bfde17bca322e8a89ba3e9dc4e4fdc2776448.tar.xz openshift-c99bfde17bca322e8a89ba3e9dc4e4fdc2776448.zip | |
Merge pull request #5995 from ashcrow/docker-gc-daemonset
Automatic merge from submit-queue.
openshift_hosted: Add docker-gc
Two new inventory variables have been created:
- ``openshift_crio_enable_docker_gc``: Enable docker_gc daemon set
- ``openshift_crio_docker_gc_node_selector``: Optional dictionary to use node
selector
When ``openshift_crio_enable_docker_gc`` and ``openshift_use_crio`` are both true
then ``docker_gc`` daemonset will be created along with adding a ``docker-gc``
sa.
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/common/openshift-cluster/install_docker_gc.yml | 7 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_hosted.yml | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/install_docker_gc.yml b/playbooks/common/openshift-cluster/install_docker_gc.yml new file mode 100644 index 000000000..1e3dfee07 --- /dev/null +++ b/playbooks/common/openshift-cluster/install_docker_gc.yml @@ -0,0 +1,7 @@ +--- +- name: Install docker gc + hosts: oo_first_master + gather_facts: false + tasks: + - include_role: + name: openshift_docker_gc diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml index c1536eb36..281ccce2e 100644 --- a/playbooks/common/openshift-cluster/openshift_hosted.yml +++ b/playbooks/common/openshift-cluster/openshift_hosted.yml @@ -24,6 +24,11 @@ - include: openshift_prometheus.yml when: openshift_hosted_prometheus_deploy | default(False) | bool +- include: install_docker_gc.yml + when: + - openshift_use_crio | default(False) | bool + - openshift_crio_enable_docker_gc | default(False) | bool + - name: Hosted Install Checkpoint End hosts: oo_all_hosts gather_facts: false |