From 8dd4ed716757f8d0d17a361ca16cc93c8f467871 Mon Sep 17 00:00:00 2001
From: Michael Gugino <mgugino@redhat.com>
Date: Sat, 9 Dec 2017 17:16:57 -0500
Subject: Add openshift_facts to upgrade plays for service_type

Bring openshift_facts into scope for plays that utilize
openshift_service_type as it is defined there.
---
 playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml   | 1 +
 playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml            | 2 ++
 .../common/openshift-cluster/upgrades/v3_7/upgrade_control_plane.yml    | 2 ++
 playbooks/common/openshift-cluster/upgrades/v3_8/upgrade.yml            | 2 ++
 .../common/openshift-cluster/upgrades/v3_8/upgrade_control_plane.yml    | 2 ++
 playbooks/common/openshift-cluster/upgrades/v3_9/upgrade.yml            | 2 ++
 .../common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml    | 2 ++
 7 files changed, 13 insertions(+)

diff --git a/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml
index 5c6def484..fcb828808 100644
--- a/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml
@@ -32,6 +32,7 @@
   any_errors_fatal: true
 
   roles:
+  - openshift_facts
   - lib_openshift
 
   tasks:
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml
index 0c1a99272..9ec788e76 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml
@@ -121,6 +121,8 @@
 - name: Cycle all controller services to force new leader election mode
   hosts: oo_masters_to_config
   gather_facts: no
+  roles:
+  - role: openshift_facts
   tasks:
   - name: Stop {{ openshift_service_type }}-master-controllers
     systemd:
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade_control_plane.yml
index 9dcad352c..ad67b6c44 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade_control_plane.yml
@@ -125,6 +125,8 @@
 - name: Cycle all controller services to force new leader election mode
   hosts: oo_masters_to_config
   gather_facts: no
+  roles:
+  - role: openshift_facts
   tasks:
   - name: Stop {{ openshift_service_type }}-master-controllers
     systemd:
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade.yml
index ead2efbd0..60ec79df5 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade.yml
@@ -121,6 +121,8 @@
 - name: Cycle all controller services to force new leader election mode
   hosts: oo_masters_to_config
   gather_facts: no
+  roles:
+  - role: openshift_facts
   tasks:
   - name: Stop {{ openshift_service_type }}-master-controllers
     systemd:
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade_control_plane.yml
index ae37b1359..c1a3f64f2 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_8/upgrade_control_plane.yml
@@ -125,6 +125,8 @@
 - name: Cycle all controller services to force new leader election mode
   hosts: oo_masters_to_config
   gather_facts: no
+  roles:
+  - role: openshift_facts
   tasks:
   - name: Stop {{ openshift_service_type }}-master-controllers
     systemd:
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade.yml
index eb688f189..1e704b66c 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade.yml
@@ -127,6 +127,8 @@
 - name: Cycle all controller services to force new leader election mode
   hosts: oo_masters_to_config
   gather_facts: no
+  roles:
+  - role: openshift_facts
   tasks:
   - name: Stop {{ openshift.common.service_type }}-master-controllers
     systemd:
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml
index 983bb4a63..a9689da1f 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml
@@ -131,6 +131,8 @@
 - name: Cycle all controller services to force new leader election mode
   hosts: oo_masters_to_config
   gather_facts: no
+  roles:
+  - role: openshift_facts
   tasks:
   - name: Stop {{ openshift.common.service_type }}-master-controllers
     systemd:
-- 
cgit v1.2.1