From 67b3fff8257072095ebdebfdfe5c429efea3a8d8 Mon Sep 17 00:00:00 2001 From: Jason DeTiberus Date: Fri, 18 Dec 2015 14:01:34 -0500 Subject: Cleanup and fixes for cluster_id change - Move debug_level into vars.yml and byo inventory - change variables in cluster_hosts.yml to be g_* and update playbooks to use those values directly instead of setting them indirectly - added a new g_all_hosts entry in cluster_hosts to use in the update playbook instead of unioning all host types within the playbook - added a cluster_hosts.yml for the byo playbook --- playbooks/byo/openshift-cluster/cluster_hosts.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 playbooks/byo/openshift-cluster/cluster_hosts.yml (limited to 'playbooks/byo/openshift-cluster/cluster_hosts.yml') diff --git a/playbooks/byo/openshift-cluster/cluster_hosts.yml b/playbooks/byo/openshift-cluster/cluster_hosts.yml new file mode 100644 index 000000000..1b2b7bff0 --- /dev/null +++ b/playbooks/byo/openshift-cluster/cluster_hosts.yml @@ -0,0 +1,11 @@ +--- +g_etcd_hosts: "{{ groups.etcd | default([]) }}" + +g_lb_hosts: "{{ groups.lb | default([]) }}" + +g_master_hosts: "{{ groups.master | default([]) }}" + +g_node_hosts: "{{ groups.node | default([]) }}" + +g_all_hosts: "{{ g_master_hosts | union(g_node_hosts) | union(g_etcd_hosts) + | union(g_lb_hosts) | default([]) }}" -- cgit v1.2.3 From da8165469a43dc3bf43b2024a76edcd04be0bb81 Mon Sep 17 00:00:00 2001 From: Jason DeTiberus Date: Fri, 18 Dec 2015 14:35:35 -0500 Subject: Fix error in byo cluster_hosts.yml --- playbooks/byo/openshift-cluster/cluster_hosts.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'playbooks/byo/openshift-cluster/cluster_hosts.yml') diff --git a/playbooks/byo/openshift-cluster/cluster_hosts.yml b/playbooks/byo/openshift-cluster/cluster_hosts.yml index 1b2b7bff0..e093b2580 100644 --- a/playbooks/byo/openshift-cluster/cluster_hosts.yml +++ b/playbooks/byo/openshift-cluster/cluster_hosts.yml @@ -3,9 +3,11 @@ g_etcd_hosts: "{{ groups.etcd | default([]) }}" g_lb_hosts: "{{ groups.lb | default([]) }}" -g_master_hosts: "{{ groups.master | default([]) }}" +g_master_hosts: "{{ groups.masters | default([]) }}" -g_node_hosts: "{{ groups.node | default([]) }}" +g_node_hosts: "{{ groups.nodes | default([]) }}" + +g_nfs_hosts: "{{ groups.nfs | default([]) }}" g_all_hosts: "{{ g_master_hosts | union(g_node_hosts) | union(g_etcd_hosts) | union(g_lb_hosts) | default([]) }}" -- cgit v1.2.3