summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorTim Bielawa <timbielawa@gmail.com>2017-04-28 12:41:09 -0400
committerGitHub <noreply@github.com>2017-04-28 12:41:09 -0400
commitd8a70bbd179c59e121a652f2b590f65ed7889eab (patch)
tree9d8c16df98ac710f1624acb5afc6f0d8be44fc82 /roles
parent7de281c7a8ddfcde6b416e3c4b0b2abb6c6c67a7 (diff)
parentb23be0da38759744cebc8d4b454af1299d97a445 (diff)
downloadopenshift-d8a70bbd179c59e121a652f2b590f65ed7889eab.tar.gz
openshift-d8a70bbd179c59e121a652f2b590f65ed7889eab.tar.bz2
openshift-d8a70bbd179c59e121a652f2b590f65ed7889eab.tar.xz
openshift-d8a70bbd179c59e121a652f2b590f65ed7889eab.zip
Merge branch 'master' into contrib_pre-commit_hook
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_node/tasks/main.yml2
-rw-r--r--roles/openshift_node_upgrade/tasks/main.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index 98139cac2..d7fea2f32 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -63,7 +63,7 @@
when:
- swap_result.stdout_lines | length > 0
- - openshift_disable_swap | default(true)
+ - openshift_disable_swap | default(true) | bool
# End Disable Swap Block
# We have to add tuned-profiles in the same transaction otherwise we run into depsolving
diff --git a/roles/openshift_node_upgrade/tasks/main.yml b/roles/openshift_node_upgrade/tasks/main.yml
index e725f4a5d..94c97d0a5 100644
--- a/roles/openshift_node_upgrade/tasks/main.yml
+++ b/roles/openshift_node_upgrade/tasks/main.yml
@@ -124,7 +124,7 @@
when:
- swap_result.stdout_lines | length > 0
- - openshift_disable_swap | default(true)
+ - openshift_disable_swap | default(true) | bool
# End Disable Swap Block
# Restart all services