Normalize tags in all places to prepare for tag fixing in future (#1739)

This commit is contained in:
Aivars Sterns
2017-10-05 10:43:04 +03:00
committed by Matthew Mosesohn
parent cb611b5ed0
commit 9c86da1403
48 changed files with 501 additions and 189 deletions

View File

@@ -3,8 +3,10 @@ dependencies:
- role: adduser
user: "{{ addusers.etcd }}"
when: not (ansible_os_family in ['CoreOS', 'Container Linux by CoreOS'] or is_atomic)
- role: download
file: "{{ downloads.etcd }}"
tags: download
tags:
- download
# NOTE: Dynamic task dependency on Vault Role if cert_management == "vault"

View File

@@ -6,7 +6,8 @@
changed_when: false
check_mode: no
when: is_etcd_master
tags: facts
tags:
- facts
- name: Configure | Add member to the cluster if it is not there
when: is_etcd_master and etcd_member_in_cluster.rc != 0 and etcd_cluster_is_healthy.rc == 0

View File

@@ -83,7 +83,8 @@
'node-{{ node }}-key.pem',
{% endfor %}]"
my_node_certs: ['ca.pem', 'node-{{ inventory_hostname }}.pem', 'node-{{ inventory_hostname }}-key.pem']
tags: facts
tags:
- facts
- name: Gen_certs | Gather etcd master certs
shell: "tar cfz - -C {{ etcd_cert_dir }} -T /dev/stdin <<< {{ my_master_certs|join(' ') }} {{ all_node_certs|join(' ') }} | base64 --wrap=0"

View File

@@ -1,11 +1,13 @@
---
- include: sync_etcd_master_certs.yml
when: inventory_hostname in groups.etcd
tags: etcd-secrets
tags:
- etcd-secrets
- include: sync_etcd_node_certs.yml
when: inventory_hostname in etcd_node_cert_hosts
tags: etcd-secrets
tags:
- etcd-secrets
# Issue master certs to Etcd nodes
- include: ../../vault/tasks/shared/issue_cert.yml

View File

@@ -1,13 +1,17 @@
---
- include: check_certs.yml
when: cert_management == "script"
tags: [etcd-secrets, facts]
tags:
- etcd-secrets
- facts
- include: "gen_certs_{{ cert_management }}.yml"
tags: etcd-secrets
tags:
- etcd-secrets
- include: upd_ca_trust.yml
tags: etcd-secrets
tags:
- etcd-secrets
- name: "Gen_certs | Get etcd certificate serials"
shell: "openssl x509 -in {{ etcd_cert_dir }}/node-{{ inventory_hostname }}.pem -noout -serial | cut -d= -f2"
@@ -16,7 +20,8 @@
- include: "install_{{ etcd_deployment_type }}.yml"
when: is_etcd_master
tags: upgrade
tags:
- upgrade
- include: set_cluster_health.yml
when: is_etcd_master and etcd_cluster_setup

View File

@@ -6,4 +6,5 @@
changed_when: false
check_mode: no
when: is_etcd_master
tags: facts
tags:
- facts

View File

@@ -9,7 +9,8 @@
{%- elif ansible_os_family in ["CoreOS", "Container Linux by CoreOS"] -%}
/etc/ssl/certs/etcd-ca.pem
{%- endif %}
tags: facts
tags:
- facts
- name: Gen_certs | add CA to trusted CA dir
copy: