From 18306e3401818cfd9723b6813987308f584c6ea3 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Wed, 20 Sep 2017 11:56:19 +0200 Subject: consolidate etcd_common role --- roles/etcd_common/tasks/backup.yml | 101 ------------------------------- roles/etcd_common/tasks/drop_etcdctl.yml | 12 ---- roles/etcd_common/tasks/main.yml | 9 --- roles/etcd_common/tasks/noop.yml | 4 -- 4 files changed, 126 deletions(-) delete mode 100644 roles/etcd_common/tasks/backup.yml delete mode 100644 roles/etcd_common/tasks/drop_etcdctl.yml delete mode 100644 roles/etcd_common/tasks/main.yml delete mode 100644 roles/etcd_common/tasks/noop.yml (limited to 'roles/etcd_common/tasks') diff --git a/roles/etcd_common/tasks/backup.yml b/roles/etcd_common/tasks/backup.yml deleted file mode 100644 index 42d27c081..000000000 --- a/roles/etcd_common/tasks/backup.yml +++ /dev/null @@ -1,101 +0,0 @@ ---- -# set the etcd backup directory name here in case the tag or sufix consists of dynamic value that changes over time -# e.g. openshift-backup-{{ lookup('pipe', 'date +%Y%m%d%H%M%S') }} value will change every second so if the date changes -# right after setting l_etcd_incontainer_backup_dir and before l_etcd_backup_dir facts, the backup directory name is different -- set_fact: - l_backup_dir_name: "openshift-backup-{{ r_etcd_common_backup_tag }}{{ r_etcd_common_backup_sufix_name }}" - -- set_fact: - l_etcd_data_dir: "{{ etcd_data_dir }}{{ '/etcd.etcd' if r_etcd_common_etcd_runtime == 'runc' else '' }}" - -- set_fact: - l_etcd_incontainer_data_dir: "{{ etcd_data_dir }}" - -- set_fact: - l_etcd_incontainer_backup_dir: "{{ l_etcd_incontainer_data_dir }}/{{ l_backup_dir_name }}" - -- set_fact: - l_etcd_backup_dir: "{{ l_etcd_data_dir }}/{{ l_backup_dir_name }}" - -# TODO: replace shell module with command and update later checks -- name: Check available disk space for etcd backup - shell: df --output=avail -k {{ l_etcd_data_dir }} | tail -n 1 - register: l_avail_disk - # AUDIT:changed_when: `false` because we are only inspecting - # state, not manipulating anything - changed_when: false - -# TODO: replace shell module with command and update later checks -- name: Check current etcd disk usage - shell: du --exclude='*openshift-backup*' -k {{ l_etcd_data_dir }} | tail -n 1 | cut -f1 - register: l_etcd_disk_usage - # AUDIT:changed_when: `false` because we are only inspecting - # state, not manipulating anything - changed_when: false - -- name: Abort if insufficient disk space for etcd backup - fail: - msg: > - {{ l_etcd_disk_usage.stdout|int*2 }} Kb disk space required for etcd backup, - {{ l_avail_disk.stdout }} Kb available. - when: l_etcd_disk_usage.stdout|int*2 > l_avail_disk.stdout|int - -# For non containerized and non embedded we should have the correct version of -# etcd installed already. So don't do anything. -# -# For containerized installs we now exec into etcd_container -# -# For embedded non containerized we need to ensure we have the latest version -# etcd on the host. -- name: Detecting Atomic Host Operating System - stat: - path: /run/ostree-booted - register: l_ostree_booted - -- name: Install latest etcd for embedded - package: - name: etcd - state: latest - when: - - r_etcd_common_embedded_etcd | bool - - not l_ostree_booted.stat.exists | bool - -- name: Check selinux label of '{{ l_etcd_data_dir }}' - command: > - stat -c '%C' {{ l_etcd_data_dir }} - register: l_etcd_selinux_labels - -- debug: - msg: "{{ l_etcd_selinux_labels }}" - -- name: Make sure the '{{ l_etcd_data_dir }}' has the proper label - command: > - chcon -t svirt_sandbox_file_t "{{ l_etcd_data_dir }}" - when: - - l_etcd_selinux_labels.rc == 0 - - "'svirt_sandbox_file_t' not in l_etcd_selinux_labels.stdout" - -- name: Generate etcd backup - command: > - {{ r_etcd_common_etcdctl_command }} backup --data-dir={{ l_etcd_incontainer_data_dir }} - --backup-dir={{ l_etcd_incontainer_backup_dir }} - -# According to the docs change you can simply copy snap/db -# https://github.com/openshift/openshift-docs/commit/b38042de02d9780842dce95cfa0ef45d53b58bc6 -- name: Check for v3 data store - stat: - path: "{{ l_etcd_data_dir }}/member/snap/db" - register: l_v3_db - -- name: Copy etcd v3 data store - command: > - cp -a {{ l_etcd_data_dir }}/member/snap/db - {{ l_etcd_backup_dir }}/member/snap/ - when: l_v3_db.stat.exists - -- set_fact: - r_etcd_common_backup_complete: True - -- name: Display location of etcd backup - debug: - msg: "Etcd backup created in {{ l_etcd_backup_dir }}" diff --git a/roles/etcd_common/tasks/drop_etcdctl.yml b/roles/etcd_common/tasks/drop_etcdctl.yml deleted file mode 100644 index 6cb456677..000000000 --- a/roles/etcd_common/tasks/drop_etcdctl.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- name: Install etcd for etcdctl - package: name=etcd{{ '-' + etcd_version if etcd_version is defined else '' }} state=present - when: not openshift.common.is_atomic | bool - -- name: Configure etcd profile.d alises - template: - dest: "/etc/profile.d/etcdctl.sh" - src: etcdctl.sh.j2 - mode: 0755 - owner: root - group: root diff --git a/roles/etcd_common/tasks/main.yml b/roles/etcd_common/tasks/main.yml deleted file mode 100644 index 6ed87e6c7..000000000 --- a/roles/etcd_common/tasks/main.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- name: Fail if invalid r_etcd_common_action provided - fail: - msg: "etcd_common role can only be called with 'noop' or 'backup' or 'drop_etcdctl'" - when: r_etcd_common_action not in ['noop', 'backup', 'drop_etcdctl'] - -- name: Include main action task file - include: "{{ r_etcd_common_action }}.yml" - when: r_etcd_common_action != "noop" diff --git a/roles/etcd_common/tasks/noop.yml b/roles/etcd_common/tasks/noop.yml deleted file mode 100644 index a88d78235..000000000 --- a/roles/etcd_common/tasks/noop.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# This is file is here because the usage of tags, specifically `pre_upgrade` -# breaks the functionality of this role. -# See https://bugzilla.redhat.com/show_bug.cgi?id=1464025 -- cgit v1.2.3