From 2c8d16c36b8eec5c2a82fb5da7291736654e55f2 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: Tue, 19 Sep 2017 09:44:37 +0200
Subject: consolidate etcd_upgrade role

---
 .../common/openshift-cluster/upgrades/etcd/upgrade.yml    |  6 +++++-
 .../upgrades/etcd/upgrade_image_members.yml               | 15 ++++++++-------
 .../upgrades/etcd/upgrade_rpm_members.yml                 | 15 ++++++++-------
 3 files changed, 21 insertions(+), 15 deletions(-)

(limited to 'playbooks')

diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml
index 39e82498d..a3446ef84 100644
--- a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml
@@ -98,7 +98,11 @@
   serial: 1
   tasks:
   - include_role:
-      name: etcd_upgrade
+      name: etcd
+      tasks_from: upgrade_image
+    vars:
+      r_etcd_common_etcd_runtime: "host"
+      etcd_peer: "{{ openshift.common.hostname }}"
     when:
     - ansible_distribution == 'Fedora'
     - not openshift.common.is_containerized | bool
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade_image_members.yml b/playbooks/common/openshift-cluster/upgrades/etcd/upgrade_image_members.yml
index 831ca8f57..e5e895775 100644
--- a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade_image_members.yml
+++ b/playbooks/common/openshift-cluster/upgrades/etcd/upgrade_image_members.yml
@@ -5,13 +5,14 @@
 - name: Upgrade containerized hosts to {{ etcd_upgrade_version }}
   hosts: oo_etcd_hosts_to_upgrade
   serial: 1
-  roles:
-  - role: etcd_upgrade
-    r_etcd_upgrade_action: upgrade
-    r_etcd_upgrade_mechanism: image
-    r_etcd_upgrade_version: "{{ etcd_upgrade_version }}"
-    r_etcd_common_etcd_runtime: "{{ openshift.common.etcd_runtime }}"
-    etcd_peer: "{{ openshift.common.hostname }}"
+  tasks:
+  - include_role:
+      name: etcd
+      tasks_from: upgrade_image
+    vars:
+      r_etcd_upgrade_version: "{{ etcd_upgrade_version }}"
+      r_etcd_common_etcd_runtime: "{{ openshift.common.etcd_runtime }}"
+      etcd_peer: "{{ openshift.common.hostname }}"
     when:
     - etcd_container_version | default('99') | version_compare(etcd_upgrade_version,'<')
     - openshift.common.is_containerized | bool
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade_rpm_members.yml b/playbooks/common/openshift-cluster/upgrades/etcd/upgrade_rpm_members.yml
index 2e79451e0..a2a26bad4 100644
--- a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade_rpm_members.yml
+++ b/playbooks/common/openshift-cluster/upgrades/etcd/upgrade_rpm_members.yml
@@ -5,13 +5,14 @@
 - name: Upgrade to {{ etcd_upgrade_version }}
   hosts: oo_etcd_hosts_to_upgrade
   serial: 1
-  roles:
-  - role: etcd_upgrade
-    r_etcd_upgrade_action: upgrade
-    r_etcd_upgrade_mechanism: rpm
-    r_etcd_upgrade_version: "{{ etcd_upgrade_version }}"
-    r_etcd_common_etcd_runtime: "host"
-    etcd_peer: "{{ openshift.common.hostname }}"
+  tasks:
+  - include_role:
+      name: etcd
+      tasks_from: upgrade_rpm
+    vars:
+      r_etcd_upgrade_version: "{{ etcd_upgrade_version }}"
+      r_etcd_common_etcd_runtime: "host"
+      etcd_peer: "{{ openshift.common.hostname }}"
     when:
     - etcd_rpm_version.stdout | default('99') | version_compare(etcd_upgrade_version, '<')
     - ansible_distribution == 'RedHat'
-- 
cgit v1.2.3