From bb1b6ab61802765f2bd4f1eae6d3eb0470589f78 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@citynetwork.eu>
Date: Thu, 23 Jun 2022 17:32:16 +0200
Subject: [PATCH] Do not try to run etcd in serial mode

Etcd static discovery, even in bootstrap mode, tries to wait for all
members to join. Until that systemd unit is in `activating` state which
means that task just timeouts waiting for activation. So etcd can not be
run in serial.

With that we also move etcd installation from zun role to the playbook.
As we still want to run playbook for zun installation/configuration in
serial mode, having etcd in independent play allows us to
do that.

This partially reverts commit Ie996262043edb8fb9c7221a5cd98e98a0111ac28

Change-Id: Ic621a7618b99abb56d24e4dcbb52b495c1b39d57
---
 playbooks/etcd-install.yml   |  2 +-
 playbooks/os-zun-install.yml | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/playbooks/etcd-install.yml b/playbooks/etcd-install.yml
index 1bd65bc427..e28aeff220 100644
--- a/playbooks/etcd-install.yml
+++ b/playbooks/etcd-install.yml
@@ -22,7 +22,7 @@
 - name: Install etcd server cluster
   hosts: etcd
   gather_facts: false
-  serial: "{{ etcd_serial | default(1) }}"
+  serial: "{{ etcd_serial | default('100%') }}"
   user: root
   pre_tasks:
     - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
diff --git a/playbooks/os-zun-install.yml b/playbooks/os-zun-install.yml
index 7fa8e6d52f..f6d1a644b3 100644
--- a/playbooks/os-zun-install.yml
+++ b/playbooks/os-zun-install.yml
@@ -23,6 +23,19 @@
   tags:
     - always
 
+- name: Install etcd cluster
+  hosts: zun_api
+  gather_facts: false
+  serial: "{{ etcd_serial | default('100%') }}"
+  roles:
+    - role: "etcd"
+      vars:
+        etcd_cluster_group: "zun_api"
+        etcd_install_type: server
+  tags:
+    - zun-install
+    - etcd-server
+
 - name: Install the zun components
   hosts: zun_all
   gather_facts: false