From 6d3e1764658582150f6c776c2662075531ccf70f Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Wed, 3 Feb 2016 13:51:27 -0500 Subject: Add new_masters to scaleup playbook. --- playbooks/byo/openshift-cluster/cluster_hosts.yml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'playbooks/byo') diff --git a/playbooks/byo/openshift-cluster/cluster_hosts.yml b/playbooks/byo/openshift-cluster/cluster_hosts.yml index 10872e738..2579f923b 100644 --- a/playbooks/byo/openshift-cluster/cluster_hosts.yml +++ b/playbooks/byo/openshift-cluster/cluster_hosts.yml @@ -5,6 +5,10 @@ g_lb_hosts: "{{ groups.lb | default([]) }}" g_master_hosts: "{{ groups.masters | default([]) }}" +g_new_master_hosts: "{{ groups.new_masters | default([]) }}" + +g_all_master_hosts: "{{ g_master_hosts | union(g_new_master_hosts) | default([]) }}" + g_node_hosts: "{{ groups.nodes | default([]) }}" g_new_node_hosts: "{{ groups.new_nodes | default([]) }}" -- cgit v1.2.3 From 89afc792b4c49e926d50b1d99c2a79ce13526285 Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Mon, 8 Feb 2016 11:34:08 -0500 Subject: Move additional master configuration into a separate master playbook. --- playbooks/byo/openshift-cluster/cluster_hosts.yml | 2 -- 1 file changed, 2 deletions(-) (limited to 'playbooks/byo') diff --git a/playbooks/byo/openshift-cluster/cluster_hosts.yml b/playbooks/byo/openshift-cluster/cluster_hosts.yml index 2579f923b..8893db245 100644 --- a/playbooks/byo/openshift-cluster/cluster_hosts.yml +++ b/playbooks/byo/openshift-cluster/cluster_hosts.yml @@ -7,8 +7,6 @@ g_master_hosts: "{{ groups.masters | default([]) }}" g_new_master_hosts: "{{ groups.new_masters | default([]) }}" -g_all_master_hosts: "{{ g_master_hosts | union(g_new_master_hosts) | default([]) }}" - g_node_hosts: "{{ groups.nodes | default([]) }}" g_new_node_hosts: "{{ groups.new_nodes | default([]) }}" -- cgit v1.2.3 From 16e1f777e1df9371c4570aed149b29bd4cdc1a6f Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Tue, 9 Feb 2016 15:13:06 -0500 Subject: Re-arrange scaleup playbooks. --- playbooks/byo/openshift-cluster/scaleup.yml | 8 -------- playbooks/byo/openshift-master/scaleup.yml | 8 ++++++++ playbooks/byo/openshift-node/filter_plugins | 1 + playbooks/byo/openshift-node/lookup_plugins | 1 + playbooks/byo/openshift-node/roles | 1 + playbooks/byo/openshift-node/scaleup.yml | 8 ++++++++ 6 files changed, 19 insertions(+), 8 deletions(-) delete mode 100644 playbooks/byo/openshift-cluster/scaleup.yml create mode 100644 playbooks/byo/openshift-master/scaleup.yml create mode 120000 playbooks/byo/openshift-node/filter_plugins create mode 120000 playbooks/byo/openshift-node/lookup_plugins create mode 120000 playbooks/byo/openshift-node/roles create mode 100644 playbooks/byo/openshift-node/scaleup.yml (limited to 'playbooks/byo') diff --git a/playbooks/byo/openshift-cluster/scaleup.yml b/playbooks/byo/openshift-cluster/scaleup.yml deleted file mode 100644 index 1702690f6..000000000 --- a/playbooks/byo/openshift-cluster/scaleup.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- include: ../../common/openshift-cluster/scaleup.yml - vars_files: - - ../../byo/openshift-cluster/cluster_hosts.yml - vars: - openshift_cluster_id: "{{ cluster_id | default('default') }}" - openshift_debug_level: "{{ debug_level | default(2) }}" - openshift_deployment_type: "{{ deployment_type }}" diff --git a/playbooks/byo/openshift-master/scaleup.yml b/playbooks/byo/openshift-master/scaleup.yml new file mode 100644 index 000000000..18797d02a --- /dev/null +++ b/playbooks/byo/openshift-master/scaleup.yml @@ -0,0 +1,8 @@ +--- +- include: ../../common/openshift-master/scaleup.yml + vars_files: + - ../../byo/openshift-cluster/cluster_hosts.yml + vars: + openshift_cluster_id: "{{ cluster_id | default('default') }}" + openshift_debug_level: "{{ debug_level | default(2) }}" + openshift_deployment_type: "{{ deployment_type }}" diff --git a/playbooks/byo/openshift-node/filter_plugins b/playbooks/byo/openshift-node/filter_plugins new file mode 120000 index 000000000..99a95e4ca --- /dev/null +++ b/playbooks/byo/openshift-node/filter_plugins @@ -0,0 +1 @@ +../../../filter_plugins \ No newline at end of file diff --git a/playbooks/byo/openshift-node/lookup_plugins b/playbooks/byo/openshift-node/lookup_plugins new file mode 120000 index 000000000..ac79701db --- /dev/null +++ b/playbooks/byo/openshift-node/lookup_plugins @@ -0,0 +1 @@ +../../../lookup_plugins \ No newline at end of file diff --git a/playbooks/byo/openshift-node/roles b/playbooks/byo/openshift-node/roles new file mode 120000 index 000000000..20c4c58cf --- /dev/null +++ b/playbooks/byo/openshift-node/roles @@ -0,0 +1 @@ +../../../roles \ No newline at end of file diff --git a/playbooks/byo/openshift-node/scaleup.yml b/playbooks/byo/openshift-node/scaleup.yml new file mode 100644 index 000000000..0343597b5 --- /dev/null +++ b/playbooks/byo/openshift-node/scaleup.yml @@ -0,0 +1,8 @@ +--- +- include: ../../common/openshift-node/scaleup.yml + vars_files: + - ../../byo/openshift-cluster/cluster_hosts.yml + vars: + openshift_cluster_id: "{{ cluster_id | default('default') }}" + openshift_debug_level: "{{ debug_level | default(2) }}" + openshift_deployment_type: "{{ deployment_type }}" -- cgit v1.2.3