summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2017-01-24 12:38:41 -0500
committerGitHub <noreply@github.com>2017-01-24 12:38:41 -0500
commit89b4e7070dc57aea6c2e1dc038348142ed4c747a (patch)
tree52b08cd2d660d351169c84b9e6ae7c360bf290f1 /playbooks/common
parentba7546d14e6b4436682f1c26028a4d872a0b5885 (diff)
parent4397b6e3dbfbc6bed8f7b653ba1b6093dbe51f5c (diff)
downloadopenshift-89b4e7070dc57aea6c2e1dc038348142ed4c747a.tar.gz
openshift-89b4e7070dc57aea6c2e1dc038348142ed4c747a.tar.bz2
openshift-89b4e7070dc57aea6c2e1dc038348142ed4c747a.tar.xz
openshift-89b4e7070dc57aea6c2e1dc038348142ed4c747a.zip
Merge pull request #3044 from mtnbikenc/docker-options
Add new option 'docker_selinux_enabled'
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/config.yml3
1 files changed, 3 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 0f226f5f9..a95cb68b7 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -38,6 +38,9 @@
- set_fact:
openshift_docker_log_options: "{{ lookup('oo_option', 'docker_log_options') }}"
when: openshift_docker_log_options is not defined
+ - set_fact:
+ openshift_docker_selinux_enabled: "{{ lookup('oo_option', 'docker_selinux_enabled') }}"
+ when: openshift_docker_selinux_enabled is not defined
- include: ../openshift-etcd/config.yml
tags: