C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1115 from mattymo/etcd-phases

Browse source 
Remove standalone etcd specific play, cleanup host mode
This commit is contained in:
Antoine Legrand 2017-03-06 11:21:08 +01:00 committed by GitHub
commit 48010cf64f
5 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cluster.yml
View file

@ -39,17 +39,17 @@
- { role: kargo-defaults, when: "cert_management == 'vault'" } - { role: kargo-defaults, when: "cert_management == 'vault'" }
- { role: vault, tags: vault, vault_bootstrap: true, 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 any_errors_fatal: true
roles: roles:
- { role: kargo-defaults} - { role: kargo-defaults}
- { role: etcd, tags: etcd } - { role: etcd, tags: etcd, etcd_cluster_setup: true }
- hosts: k8s-cluster - hosts: k8s-cluster
any_errors_fatal: true any_errors_fatal: true
roles: roles:
- { role: kargo-defaults} - { role: kargo-defaults}
- { role: etcd, tags: etcd } - { role: etcd, tags: etcd, etcd_cluster_setup: false }
- hosts: etcd:k8s-cluster:vault - hosts: etcd:k8s-cluster:vault
any_errors_fatal: true any_errors_fatal: true

3
roles/etcd/defaults/main.yml
View file

@ -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_bin_dir: "{{ local_release_dir }}/etcd/etcd-{{ etcd_version }}-linux-amd64/"
etcd_data_dir: "/var/lib/etcd" etcd_data_dir: "/var/lib/etcd"

9
roles/etcd/tasks/install_host.yml
View file

@ -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

18
roles/etcd/tasks/main.yml
View file

@ -1,5 +1,6 @@
--- ---
- include: pre_upgrade.yml - include: pre_upgrade.yml
when: etcd_cluster_setup
tags: etcd-pre-upgrade tags: etcd-pre-upgrade
- include: check_certs.yml - include: check_certs.yml
@ -27,19 +28,18 @@
tags: upgrade tags: upgrade
- include: set_cluster_health.yml - include: set_cluster_health.yml
when: is_etcd_master when: is_etcd_master and etcd_cluster_setup
- include: configure.yml - include: configure.yml
when: is_etcd_master when: is_etcd_master and etcd_cluster_setup
- include: refresh_config.yml - 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 command: /bin/true
notify: restart etcd notify: restart etcd
when: etcd_deployment_type == "host" and etcd_copy.stdout_lines and is_etcd_master when: is_etcd_master and etcd_secret_changed|default(false)
or etcd_secret_changed|default(false)
# reload-systemd # reload-systemd
- meta: flush_handlers - meta: flush_handlers
@ -49,13 +49,13 @@
name: etcd name: etcd
state: started state: started
enabled: yes enabled: yes
when: is_etcd_master when: is_etcd_master and etcd_cluster_setup
# After etcd cluster is assembled, make sure that # After etcd cluster is assembled, make sure that
# initial state of the cluster is in `existing` # initial state of the cluster is in `existing`
# state insted of `new`. # state insted of `new`.
- include: set_cluster_health.yml - include: set_cluster_health.yml
when: is_etcd_master when: is_etcd_master and etcd_cluster_setup
- include: refresh_config.yml - include: refresh_config.yml
when: is_etcd_master when: is_etcd_master and etcd_cluster_setup

6
upgrade-cluster.yml
View file

@ -39,17 +39,17 @@
- { role: kargo-defaults, when: "cert_management == 'vault'" } - { role: kargo-defaults, when: "cert_management == 'vault'" }
- { role: vault, tags: vault, vault_bootstrap: true, 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 any_errors_fatal: true
roles: roles:
- { role: kargo-defaults} - { role: kargo-defaults}
- { role: etcd, tags: etcd } - { role: etcd, tags: etcd, etcd_cluster_setup: true }
- hosts: k8s-cluster - hosts: k8s-cluster
any_errors_fatal: true any_errors_fatal: true
roles: roles:
- { role: kargo-defaults} - { role: kargo-defaults}
- { role: etcd, tags: etcd } - { role: etcd, tags: etcd, etcd_cluster_setup: false }
- hosts: etcd:k8s-cluster:vault - hosts: etcd:k8s-cluster:vault
any_errors_fatal: true any_errors_fatal: true