summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-09-01 02:42:41 -0400
committerGitHub <noreply@github.com>2017-09-01 02:42:41 -0400
commit9fef95ead2bd088327627e2773a754f664935761 (patch)
treecdf2822a84e130caf94141ccb532a6d1d427dbda
parentc29ef64159a2eaa08d8635aef69088c84d1daede (diff)
parent73415c165d09adfda3b3c35369fc1b8cfd446322 (diff)
downloadopenshift-9fef95ead2bd088327627e2773a754f664935761.tar.gz
openshift-9fef95ead2bd088327627e2773a754f664935761.tar.bz2
openshift-9fef95ead2bd088327627e2773a754f664935761.tar.xz
openshift-9fef95ead2bd088327627e2773a754f664935761.zip
Merge pull request #5283 from mtnbikenc/move-aio-fail
Merged by openshift-bot
-rw-r--r--playbooks/common/openshift-cluster/config.yml6
-rw-r--r--playbooks/common/openshift-cluster/evaluate_groups.yml11
2 files changed, 10 insertions, 7 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 26b27ba39..31c4b04af 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -18,12 +18,6 @@
- docker_image_availability
- docker_storage
-- hosts: localhost
- tasks:
- - fail:
- msg: No etcd hosts defined. Running an all-in-one master is deprecated and will no longer be supported in a future upgrade.
- when: groups.oo_etcd_to_config | default([]) | length == 0 and not openshift_master_unsupported_all_in_one | default(False)
-
- include: initialize_oo_option_facts.yml
tags:
- always
diff --git a/playbooks/common/openshift-cluster/evaluate_groups.yml b/playbooks/common/openshift-cluster/evaluate_groups.yml
index a1ae14a1f..c9f37109b 100644
--- a/playbooks/common/openshift-cluster/evaluate_groups.yml
+++ b/playbooks/common/openshift-cluster/evaluate_groups.yml
@@ -33,13 +33,22 @@
- name: Evaluate groups - g_nfs_hosts is single host
fail:
msg: The nfs group must be limited to one host
- when: (groups[g_nfs_hosts] | default([])) | length > 1
+ when: g_nfs_hosts | default([]) | length > 1
- name: Evaluate groups - g_glusterfs_hosts required
fail:
msg: This playbook requires g_glusterfs_hosts to be set
when: g_glusterfs_hosts is not defined
+ - name: Evaluate groups - Fail if no etcd hosts group is defined
+ fail:
+ msg: >
+ No etcd hosts defined. Running an all-in-one master is deprecated and
+ will no longer be supported in a future upgrade.
+ when:
+ - g_etcd_hosts | default([]) | length == 0
+ - not openshift_master_unsupported_all_in_one | default(False)
+
- name: Evaluate oo_all_hosts
add_host:
name: "{{ item }}"