summaryrefslogtreecommitdiffstats
path: root/roles/openshift_common
diff options
context:
space:
mode:
authorTim Bielawa <timbielawa@gmail.com>2016-12-12 11:39:44 -0800
committerGitHub <noreply@github.com>2016-12-12 11:39:44 -0800
commit7374505de2a11b94d22672b8da7e405b919a15bc (patch)
tree51881c3f16f1f7368bdbf62e0478a6c292a5470a /roles/openshift_common
parent91fba8015e9e8035cca2444dbbc8954a27e2310e (diff)
parentbe97433dd559a3bdae4baedda20a7f17bd47450b (diff)
downloadopenshift-7374505de2a11b94d22672b8da7e405b919a15bc.tar.gz
openshift-7374505de2a11b94d22672b8da7e405b919a15bc.tar.bz2
openshift-7374505de2a11b94d22672b8da7e405b919a15bc.tar.xz
openshift-7374505de2a11b94d22672b8da7e405b919a15bc.zip
Merge pull request #2964 from mtnbikenc/linting-refactor
YAML Linting with CI checking
Diffstat (limited to 'roles/openshift_common')
-rw-r--r--roles/openshift_common/tasks/main.yml5
1 files changed, 2 insertions, 3 deletions
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml
index c9a44b3f5..0a476ac26 100644
--- a/roles/openshift_common/tasks/main.yml
+++ b/roles/openshift_common/tasks/main.yml
@@ -4,11 +4,11 @@
when: openshift_use_openshift_sdn | default(true) | bool and openshift_use_flannel | default(false) | bool
- fail:
- msg: Nuage sdn can not be used with openshift sdn, set openshift_use_openshift_sdn=false if you want to use nuage
+ msg: Nuage sdn can not be used with openshift sdn, set openshift_use_openshift_sdn=false if you want to use nuage
when: openshift_use_openshift_sdn | default(true) | bool and openshift_use_nuage | default(false) | bool
- fail:
- msg: Nuage sdn can not be used with flannel
+ msg: Nuage sdn can not be used with flannel
when: openshift_use_flannel | default(false) | bool and openshift_use_nuage | default(false) | bool
- fail:
@@ -46,4 +46,3 @@
command: >
hostnamectl set-hostname {{ openshift.common.hostname }}
when: openshift_set_hostname | default(set_hostname_default) | bool
-