From ecb0cbe04149fdcbf3992ccfc7578c6605462bc3 Mon Sep 17 00:00:00 2001 From: Russell Teague Date: Thu, 31 Aug 2017 14:42:01 -0400 Subject: Break out node config into stand-alone playbook Added byo/openshift-node/config.yml as a new entry point for performing node installation. This playbook must be run after masters have already been deployed. Excluder disable/enable for both nodes and masters has been moved their respective config.yml. This created a common pattern that could be used for both installation and scaleup playbooks. --- playbooks/byo/openshift-node/config.yml | 6 ++++++ playbooks/byo/openshift-node/restart.yml | 4 ---- playbooks/byo/openshift-node/scaleup.yml | 7 +------ 3 files changed, 7 insertions(+), 10 deletions(-) create mode 100644 playbooks/byo/openshift-node/config.yml (limited to 'playbooks/byo') diff --git a/playbooks/byo/openshift-node/config.yml b/playbooks/byo/openshift-node/config.yml new file mode 100644 index 000000000..839dc36ff --- /dev/null +++ b/playbooks/byo/openshift-node/config.yml @@ -0,0 +1,6 @@ +--- +- include: ../openshift-cluster/initialize_groups.yml + +- include: ../../common/openshift-cluster/std_include.yml + +- include: ../../common/openshift-node/config.yml diff --git a/playbooks/byo/openshift-node/restart.yml b/playbooks/byo/openshift-node/restart.yml index 92665d71d..ccf9e82da 100644 --- a/playbooks/byo/openshift-node/restart.yml +++ b/playbooks/byo/openshift-node/restart.yml @@ -1,10 +1,6 @@ --- - include: ../openshift-cluster/initialize_groups.yml - tags: - - always - include: ../../common/openshift-cluster/std_include.yml - tags: - - always - include: ../../common/openshift-node/restart.yml diff --git a/playbooks/byo/openshift-node/scaleup.yml b/playbooks/byo/openshift-node/scaleup.yml index 0225623c6..e0c36fb69 100644 --- a/playbooks/byo/openshift-node/scaleup.yml +++ b/playbooks/byo/openshift-node/scaleup.yml @@ -16,9 +16,4 @@ - include: ../../common/openshift-cluster/std_include.yml -- include: ../../common/openshift-node/scaleup.yml - vars: - openshift_cluster_id: "{{ cluster_id | default('default') }}" - openshift_debug_level: "{{ debug_level | default(2) }}" - openshift_master_etcd_hosts: "{{ groups.etcd | default([]) }}" - openshift_master_etcd_port: 2379 +- include: ../../common/openshift-node/config.yml -- cgit v1.2.3