From 606dc36288ef5478a9dae3f35f88e2f283d7635d Mon Sep 17 00:00:00 2001
From: Russell Teague <rteague@redhat.com>
Date: Thu, 31 Aug 2017 21:53:10 -0400
Subject: Break out master config into stand-alone playbook

Added byo/openshift-master/config.yml as a new entry point for
performing master installation.

Excluder disable/enable for master has been moved to
common/openshift-master/config.yml to follow a standard pattern that
could be used for both installation and scaleup playbooks.
---
 playbooks/byo/openshift-master/config.yml          |  6 ++++++
 playbooks/byo/openshift-master/restart.yml         |  4 ----
 .../common/openshift-cluster/additional_config.yml | 23 ----------------------
 playbooks/common/openshift-cluster/config.yml      |  6 ------
 .../common/openshift-master/additional_config.yml  | 23 ++++++++++++++++++++++
 playbooks/common/openshift-master/config.yml       |  3 +++
 6 files changed, 32 insertions(+), 33 deletions(-)
 create mode 100644 playbooks/byo/openshift-master/config.yml
 delete mode 100644 playbooks/common/openshift-cluster/additional_config.yml
 create mode 100644 playbooks/common/openshift-master/additional_config.yml

diff --git a/playbooks/byo/openshift-master/config.yml b/playbooks/byo/openshift-master/config.yml
new file mode 100644
index 000000000..98be0c448
--- /dev/null
+++ b/playbooks/byo/openshift-master/config.yml
@@ -0,0 +1,6 @@
+---
+- include: ../openshift-cluster/initialize_groups.yml
+
+- include: ../../common/openshift-cluster/std_include.yml
+
+- include: ../../common/openshift-master/config.yml
diff --git a/playbooks/byo/openshift-master/restart.yml b/playbooks/byo/openshift-master/restart.yml
index 7988863f3..8950efd00 100644
--- a/playbooks/byo/openshift-master/restart.yml
+++ b/playbooks/byo/openshift-master/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-master/restart.yml
diff --git a/playbooks/common/openshift-cluster/additional_config.yml b/playbooks/common/openshift-cluster/additional_config.yml
deleted file mode 100644
index c0ea93d2c..000000000
--- a/playbooks/common/openshift-cluster/additional_config.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- name: Additional master configuration
-  hosts: oo_first_master
-  vars:
-    cockpit_plugins: "{{ osm_cockpit_plugins | default(['cockpit-kubernetes']) }}"
-    etcd_urls: "{{ openshift.master.etcd_urls }}"
-    openshift_master_ha: "{{ groups.oo_masters | length > 1 }}"
-    omc_cluster_hosts: "{{ groups.oo_masters | join(' ')}}"
-  roles:
-  - role: openshift_master_cluster
-    when: openshift_master_ha | bool and openshift.master.cluster_method == "pacemaker"
-  - role: openshift_examples
-    registry_url: "{{ openshift.master.registry_url }}"
-    when: openshift.common.install_examples | bool
-  - role: openshift_hosted_templates
-    registry_url: "{{ openshift.master.registry_url }}"
-  - role: openshift_manageiq
-    when: openshift.common.use_manageiq | bool
-  - role: cockpit
-    when: not openshift.common.is_atomic and ( deployment_type in ['atomic-enterprise','openshift-enterprise'] ) and
-      (osm_use_cockpit | bool or osm_use_cockpit is undefined ) and ( openshift.common.deployment_subtype != 'registry' )
-  - role: flannel_register
-    when: openshift.common.use_flannel | bool
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 7874391cc..a406b5656 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -35,12 +35,6 @@
   - loadbalancer
 
 - include: ../openshift-master/config.yml
-  tags:
-  - master
-
-- include: additional_config.yml
-  tags:
-  - master
 
 - include: ../openshift-node/config.yml
   tags:
diff --git a/playbooks/common/openshift-master/additional_config.yml b/playbooks/common/openshift-master/additional_config.yml
new file mode 100644
index 000000000..c0ea93d2c
--- /dev/null
+++ b/playbooks/common/openshift-master/additional_config.yml
@@ -0,0 +1,23 @@
+---
+- name: Additional master configuration
+  hosts: oo_first_master
+  vars:
+    cockpit_plugins: "{{ osm_cockpit_plugins | default(['cockpit-kubernetes']) }}"
+    etcd_urls: "{{ openshift.master.etcd_urls }}"
+    openshift_master_ha: "{{ groups.oo_masters | length > 1 }}"
+    omc_cluster_hosts: "{{ groups.oo_masters | join(' ')}}"
+  roles:
+  - role: openshift_master_cluster
+    when: openshift_master_ha | bool and openshift.master.cluster_method == "pacemaker"
+  - role: openshift_examples
+    registry_url: "{{ openshift.master.registry_url }}"
+    when: openshift.common.install_examples | bool
+  - role: openshift_hosted_templates
+    registry_url: "{{ openshift.master.registry_url }}"
+  - role: openshift_manageiq
+    when: openshift.common.use_manageiq | bool
+  - role: cockpit
+    when: not openshift.common.is_atomic and ( deployment_type in ['atomic-enterprise','openshift-enterprise'] ) and
+      (osm_use_cockpit | bool or osm_use_cockpit is undefined ) and ( openshift.common.deployment_subtype != 'registry' )
+  - role: flannel_register
+    when: openshift.common.use_flannel | bool
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 96440a2ab..b29b9ef4f 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -217,6 +217,9 @@
     group_by: key=oo_masters_deployment_type_{{ openshift.common.deployment_type }}
     changed_when: False
 
+- include: additional_config.yml
+  when: not g_openshift_master_is_scaleup
+
 - name: Re-enable excluder if it was previously enabled
   hosts: oo_masters_to_config
   gather_facts: no
-- 
cgit v1.2.3