summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/initialize_openshift_version.yml3
-rw-r--r--playbooks/common/openshift-cluster/redeploy-certificates.yml5
-rw-r--r--playbooks/common/openshift-cluster/update_repos_and_packages.yml3
-rw-r--r--playbooks/common/openshift-cluster/upgrades/init.yml8
-rw-r--r--playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml2
5 files changed, 13 insertions, 8 deletions
diff --git a/playbooks/common/openshift-cluster/initialize_openshift_version.yml b/playbooks/common/openshift-cluster/initialize_openshift_version.yml
index a1bd1bd92..07b38920f 100644
--- a/playbooks/common/openshift-cluster/initialize_openshift_version.yml
+++ b/playbooks/common/openshift-cluster/initialize_openshift_version.yml
@@ -1,6 +1,7 @@
---
# NOTE: requires openshift_facts be run
-- hosts: l_oo_all_hosts
+- name: Verify compatible yum/subscription-manager combination
+ hosts: l_oo_all_hosts
gather_facts: no
tasks:
# See:
diff --git a/playbooks/common/openshift-cluster/redeploy-certificates.yml b/playbooks/common/openshift-cluster/redeploy-certificates.yml
index 2383836d4..a0e3f1d8a 100644
--- a/playbooks/common/openshift-cluster/redeploy-certificates.yml
+++ b/playbooks/common/openshift-cluster/redeploy-certificates.yml
@@ -228,9 +228,8 @@
- name: Drain node
command: >
- {{ openshift.common.client_binary }} adm --config={{ hostvars[groups.oo_first_master.0].mktemp.stdout }}/admin.kubeconfig
- manage-node {{ openshift.node.nodename }}
- {{ openshift.common.evacuate_or_drain }} --force
+ {{ openshift.common.admin_binary }} --config={{ hostvars[groups.oo_first_master.0].mktemp.stdout }}/admin.kubeconfig
+ drain {{ openshift.node.nodename }} --force --delete-local-data
delegate_to: "{{ groups.oo_first_master.0 }}"
when: openshift_certificates_redeploy_ca | default(false) | bool and was_schedulable | bool
diff --git a/playbooks/common/openshift-cluster/update_repos_and_packages.yml b/playbooks/common/openshift-cluster/update_repos_and_packages.yml
index e3d16d359..b83e4d821 100644
--- a/playbooks/common/openshift-cluster/update_repos_and_packages.yml
+++ b/playbooks/common/openshift-cluster/update_repos_and_packages.yml
@@ -1,7 +1,8 @@
---
- include: evaluate_groups.yml
-- hosts: oo_hosts_to_update
+- name: Subscribe hosts, update repos and update OS packages
+ hosts: oo_hosts_to_update
vars:
openshift_deployment_type: "{{ deployment_type }}"
roles:
diff --git a/playbooks/common/openshift-cluster/upgrades/init.yml b/playbooks/common/openshift-cluster/upgrades/init.yml
index 235853b0f..b62557550 100644
--- a/playbooks/common/openshift-cluster/upgrades/init.yml
+++ b/playbooks/common/openshift-cluster/upgrades/init.yml
@@ -1,9 +1,11 @@
---
-- name: Create l_oo_all_hosts group
+- name: Create initial host groups for localhost
hosts: localhost
connection: local
become: no
gather_facts: no
+ tags:
+ - always
tasks:
- include_vars: ../../../byo/openshift-cluster/cluster_hosts.yml
- name: Evaluate group l_oo_all_hosts
@@ -13,9 +15,11 @@
with_items: "{{ g_all_hosts | default([]) }}"
changed_when: False
-- name: Include g_*_hosts vars for hosts in group l_oo_all_hosts
+- name: Create initial host groups for all hosts
hosts: l_oo_all_hosts
gather_facts: no
+ tags:
+ - always
tasks:
- include_vars: ../../../byo/openshift-cluster/cluster_hosts.yml
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml
index 2bb460815..5fa74898f 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml
+++ b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml
@@ -41,7 +41,7 @@
- name: Drain Node for Kubelet upgrade
command: >
- {{ hostvars[groups.oo_first_master.0].openshift.common.client_binary }} adm manage-node {{ openshift.node.nodename | lower }} {{ openshift.common.evacuate_or_drain }} --force
+ {{ hostvars[groups.oo_first_master.0].openshift.common.admin_binary }} drain {{ openshift.node.nodename | lower }} --force --delete-local-data
delegate_to: "{{ groups.oo_first_master.0 }}"
when: inventory_hostname in groups.oo_nodes_to_upgrade