From 02a8e789027b9797ef88aa550f0e171eaf479388 Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <mmosesohn@mirantis.com>
Date: Sat, 4 Mar 2017 00:30:37 +0400
Subject: [PATCH] Remove standalone etcd specific play, cleanup host mode
Now etcd role can optionally disable etcd cluster setup for faster
deployment when it is combined with etcd role.
---
cluster.yml | 6 +++---
roles/etcd/defaults/main.yml | 3 +++
roles/etcd/tasks/install_host.yml | 9 ---------
roles/etcd/tasks/main.yml | 18 +++++++++---------
upgrade-cluster.yml | 6 +++---
5 files changed, 18 insertions(+), 24 deletions(-)
delete mode 100644 roles/etcd/tasks/install_host.yml
diff --git a/cluster.yml b/cluster.yml
index f0c324174..01b033b2f 100644
--- a/cluster.yml
+++ b/cluster.yml
@@ -39,17 +39,17 @@
- { role: kargo-defaults, when: "cert_management == 'vault'" }
- { role: vault, tags: vault, vault_bootstrap: true, when: "cert_management == 'vault'" }
-- hosts: etcd:!k8s-cluster
+- hosts: etcd
any_errors_fatal: true
roles:
- { role: kargo-defaults}
- - { role: etcd, tags: etcd }
+ - { role: etcd, tags: etcd, etcd_cluster_setup: true }
- hosts: k8s-cluster
any_errors_fatal: true
roles:
- { role: kargo-defaults}
- - { role: etcd, tags: etcd }
+ - { role: etcd, tags: etcd, etcd_cluster_setup: false }
- hosts: etcd:k8s-cluster:vault
any_errors_fatal: true
diff --git a/roles/etcd/defaults/main.yml b/roles/etcd/defaults/main.yml
index 228228020..6326741b3 100644
--- a/roles/etcd/defaults/main.yml
+++ b/roles/etcd/defaults/main.yml
@@ -1,4 +1,7 @@
---
+# Set to false to only do certificate management
+etcd_cluster_setup: true
+
etcd_bin_dir: "{{ local_release_dir }}/etcd/etcd-{{ etcd_version }}-linux-amd64/"
etcd_data_dir: "/var/lib/etcd"
diff --git a/roles/etcd/tasks/install_host.yml b/roles/etcd/tasks/install_host.yml
deleted file mode 100644
index 6f588a2f0..000000000
--- a/roles/etcd/tasks/install_host.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Install | Copy etcd binary from downloaddir
- command: rsync -piu "{{ etcd_bin_dir }}/etcd" "{{ bin_dir }}/etcd"
- register: etcd_copy
- changed_when: false
-
-- name: Install | Copy etcdctl binary from downloaddir
- command: rsync -piu "{{ etcd_bin_dir }}/etcdctl" "{{ bin_dir }}/etcdctl"
- changed_when: false
diff --git a/roles/etcd/tasks/main.yml b/roles/etcd/tasks/main.yml
index 1af265736..02737ea31 100644
--- a/roles/etcd/tasks/main.yml
+++ b/roles/etcd/tasks/main.yml
@@ -1,5 +1,6 @@
---
- include: pre_upgrade.yml
+ when: etcd_cluster_setup
tags: etcd-pre-upgrade
- include: check_certs.yml
@@ -27,19 +28,18 @@
tags: upgrade
- include: set_cluster_health.yml
- when: is_etcd_master
+ when: is_etcd_master and etcd_cluster_setup
- include: configure.yml
- when: is_etcd_master
+ when: is_etcd_master and etcd_cluster_setup
- include: refresh_config.yml
- when: is_etcd_master
+ when: is_etcd_master and etcd_cluster_setup
-- name: Restart etcd if binary or certs changed
+- name: Restart etcd if certs changed
command: /bin/true
notify: restart etcd
- when: etcd_deployment_type == "host" and etcd_copy.stdout_lines and is_etcd_master
- or etcd_secret_changed|default(false)
+ when: is_etcd_master and etcd_secret_changed|default(false)
# reload-systemd
- meta: flush_handlers
@@ -49,13 +49,13 @@
name: etcd
state: started
enabled: yes
- when: is_etcd_master
+ when: is_etcd_master and etcd_cluster_setup
# After etcd cluster is assembled, make sure that
# initial state of the cluster is in `existing`
# state insted of `new`.
- include: set_cluster_health.yml
- when: is_etcd_master
+ when: is_etcd_master and etcd_cluster_setup
- include: refresh_config.yml
- when: is_etcd_master
+ when: is_etcd_master and etcd_cluster_setup
diff --git a/upgrade-cluster.yml b/upgrade-cluster.yml
index eea3b69aa..f4f48d543 100644
--- a/upgrade-cluster.yml
+++ b/upgrade-cluster.yml
@@ -39,17 +39,17 @@
- { role: kargo-defaults, when: "cert_management == 'vault'" }
- { role: vault, tags: vault, vault_bootstrap: true, when: "cert_management == 'vault'" }
-- hosts: etcd:!k8s-cluster
+- hosts: etcd
any_errors_fatal: true
roles:
- { role: kargo-defaults}
- - { role: etcd, tags: etcd }
+ - { role: etcd, tags: etcd, etcd_cluster_setup: true }
- hosts: k8s-cluster
any_errors_fatal: true
roles:
- { role: kargo-defaults}
- - { role: etcd, tags: etcd }
+ - { role: etcd, tags: etcd, etcd_cluster_setup: false }
- hosts: etcd:k8s-cluster:vault
any_errors_fatal: true
--
GitLab