summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-11-02 16:41:47 -0400
committerSteve Milner <smilner@redhat.com>2017-11-02 18:07:01 -0400
commitb88adec6c15157c2894ccfe2ac855e67fb48ca33 (patch)
treeaea5e7f13ce7cda84cf97de2ff55851d07172987 /playbooks/common
parent129e91a3654943228c9ddeb38d6119a706cedcc2 (diff)
downloadopenshift-b88adec6c15157c2894ccfe2ac855e67fb48ca33.tar.gz
openshift-b88adec6c15157c2894ccfe2ac855e67fb48ca33.tar.bz2
openshift-b88adec6c15157c2894ccfe2ac855e67fb48ca33.tar.xz
openshift-b88adec6c15157c2894ccfe2ac855e67fb48ca33.zip
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 dockergc daemonset will be created along with adding a dockergc sa. Signed-off-by: Steve Milner <smilner@redhat.com>
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/install_docker_gc.yml7
-rw-r--r--playbooks/common/openshift-cluster/openshift_hosted.yml5
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