summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--playbooks/byo/config.yml2
-rw-r--r--roles/openshift_facts/tasks/main.yml6
2 files changed, 8 insertions, 0 deletions
diff --git a/playbooks/byo/config.yml b/playbooks/byo/config.yml
index dce49d32f..e059514db 100644
--- a/playbooks/byo/config.yml
+++ b/playbooks/byo/config.yml
@@ -1,6 +1,8 @@
---
- name: Run the openshift-master config playbook
include: openshift-master/config.yml
+ when: groups.masters is defined and groups.masters
- name: Run the openshift-node config playbook
include: openshift-node/config.yml
+ when: groups.nodes is defined and groups.nodes and groups.masters is defined and groups.masters
diff --git a/roles/openshift_facts/tasks/main.yml b/roles/openshift_facts/tasks/main.yml
index 5a7d10d25..d71e6d019 100644
--- a/roles/openshift_facts/tasks/main.yml
+++ b/roles/openshift_facts/tasks/main.yml
@@ -1,3 +1,9 @@
---
+- name: Verify Ansible version is greater than 1.8.0 and not 1.9.0
+ assert:
+ that:
+ - ansible_version | version_compare('1.8.0', 'ge')
+ - ansible_version | version_compare('1.9.0', 'ne')
+
- name: Gather OpenShift facts
openshift_facts: