From f4b33dcd0dbe0528e9328566b163773ac5de9ec9 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Mon, 15 Aug 2022 01:50:01 +0200 Subject: elevate mediachannel: refactor group and hostnames --- dan/ele-emc-ctrl.yml | 18 ++++++++++++++++++ dan/emc-00.yml | 22 ---------------------- dan/emc-cdn.yml | 16 ++++++++++++++++ dan/emc-ctrl.yml | 14 -------------- dan/emc-dist.yml | 12 ------------ dan/emc-xx.yml | 22 ---------------------- dan/group_vars/elevate-mediachannel.yml | 10 ++++++++++ dan/group_vars/emc.yml | 10 ---------- dan/k8s-emc.yml | 4 ++-- 9 files changed, 46 insertions(+), 82 deletions(-) create mode 100644 dan/ele-emc-ctrl.yml delete mode 100644 dan/emc-00.yml create mode 100644 dan/emc-cdn.yml delete mode 100644 dan/emc-ctrl.yml delete mode 100644 dan/emc-dist.yml delete mode 100644 dan/emc-xx.yml create mode 100644 dan/group_vars/elevate-mediachannel.yml delete mode 100644 dan/group_vars/emc.yml (limited to 'dan') diff --git a/dan/ele-emc-ctrl.yml b/dan/ele-emc-ctrl.yml new file mode 100644 index 00000000..fc6456cb --- /dev/null +++ b/dan/ele-emc-ctrl.yml @@ -0,0 +1,18 @@ +--- +- name: Basic Setup + hosts: ele-emc-ctrl + roles: + - role: apt-repo/base + - role: core/base + - role: core/sshd/base + - role: core/zsh + - role: core/ntp + +- name: Payload Setup + hosts: ele-emc-ctrl + roles: + - role: apt-repo/spreadspace + - role: nginx/base +# - role: monitoring/prometheus/exporter + - role: storage/lvm/groups + - role: elevate/emc-stats diff --git a/dan/emc-00.yml b/dan/emc-00.yml deleted file mode 100644 index adf919fe..00000000 --- a/dan/emc-00.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- name: Basic Setup - hosts: emc-00 - roles: - - role: apt-repo/base - - role: core/base - - role: core/sshd/base - - role: core/zsh - - role: core/ntp - - role: apt-repo/spreadspace - - role: nginx/base - - role: monitoring/prometheus/exporter - - role: acmetool/base - - role: acmetool/cert - acmetool_cert_name: emc-live.elev8.at - - role: acmetool/cert - acmetool_cert_name: emc-stats.elev8.at - - role: acmetool/cert - acmetool_cert_name: stream.elev8.at - acmetool_cert_hostnames: - - stream.elev8.at - - stream.elevate.at diff --git a/dan/emc-cdn.yml b/dan/emc-cdn.yml new file mode 100644 index 00000000..5f34d3ef --- /dev/null +++ b/dan/emc-cdn.yml @@ -0,0 +1,16 @@ +--- +- name: Basic Setup + hosts: "{{ install_hostname }}" + roles: + - role: apt-repo/base + - role: core/base + - role: core/sshd/base + - role: core/zsh + - role: core/ntp + +- name: Payload Setup + hosts: "{{ install_hostname }}" + roles: + - role: apt-repo/spreadspace + - role: nginx/base +# - role: monitoring/prometheus/exporter diff --git a/dan/emc-ctrl.yml b/dan/emc-ctrl.yml deleted file mode 100644 index 9d795ef9..00000000 --- a/dan/emc-ctrl.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- name: Basic Setup - hosts: emc-ctrl - roles: - - role: apt-repo/base - - role: core/base - - role: core/sshd/base - - role: core/zsh - - role: core/ntp - - role: apt-repo/spreadspace - - role: nginx/base - - role: monitoring/prometheus/exporter - - role: storage/lvm/groups - - role: elevate/emc-stats diff --git a/dan/emc-dist.yml b/dan/emc-dist.yml deleted file mode 100644 index 62c5a1ef..00000000 --- a/dan/emc-dist.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- name: Basic Setup - hosts: "{{ install_hostname }}" - roles: - - role: apt-repo/base - - role: core/base - - role: core/sshd/base - - role: core/zsh - - role: core/ntp - - role: apt-repo/spreadspace - - role: nginx/base - - role: monitoring/prometheus/exporter diff --git a/dan/emc-xx.yml b/dan/emc-xx.yml deleted file mode 100644 index 6de17b55..00000000 --- a/dan/emc-xx.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- name: Basic Setup - hosts: "{{ install_hostname }}" - roles: - - role: apt-repo/base - - role: core/base - - role: core/sshd/base - - role: core/zsh - - role: core/ntp - - role: apt-repo/spreadspace - - role: nginx/base - - role: monitoring/prometheus/exporter - - role: acmetool/base - - role: acmetool/cert - acmetool_cert_name: "{{ host_name }}.{{ host_domain }}" - - role: storage/lvm/volume - lvm_volume: - vg: "{{ host_name }}" - lv: cache - size: 1536M - fs: ext4 - dest: /srv/cache diff --git a/dan/group_vars/elevate-mediachannel.yml b/dan/group_vars/elevate-mediachannel.yml new file mode 100644 index 00000000..311fbe31 --- /dev/null +++ b/dan/group_vars/elevate-mediachannel.yml @@ -0,0 +1,10 @@ +$ANSIBLE_VAULT;1.2;AES256;dan +38623432343430343233653166646531333662656531626437333834373837653562663538323934 +3063636231616330373135313364306635623561383530350a306366373065336530653939326134 +63663764666665663030326639303634663166316234346339313934653563386163386434383738 +3937306234656563660a373639613435303066366134303134633261363237626463666661643636 +34346662313338633236373035316539306166643038653266633234653862383639613965373738 +35663863326138396134656266666636636435323563616130623734646638623938303036306664 +64666131643238613565336431323466656532633332623439333232396133353331666636383062 +66316534613464373133663564333837303762663334396132386539613031326431356137663733 +3332 diff --git a/dan/group_vars/emc.yml b/dan/group_vars/emc.yml deleted file mode 100644 index 311fbe31..00000000 --- a/dan/group_vars/emc.yml +++ /dev/null @@ -1,10 +0,0 @@ -$ANSIBLE_VAULT;1.2;AES256;dan -38623432343430343233653166646531333662656531626437333834373837653562663538323934 -3063636231616330373135313364306635623561383530350a306366373065336530653939326134 -63663764666665663030326639303634663166316234346339313934653563386163386434383738 -3937306234656563660a373639613435303066366134303134633261363237626463666661643636 -34346662313338633236373035316539306166643038653266633234653862383639613965373738 -35663863326138396134656266666636636435323563616130623734646638623938303036306664 -64666131643238613565336431323466656532633332623439333232396133353331666636383062 -66316534613464373133663564333837303762663334396132386539613031326431356137663733 -3332 diff --git a/dan/k8s-emc.yml b/dan/k8s-emc.yml index 33897dba..fd74a209 100644 --- a/dan/k8s-emc.yml +++ b/dan/k8s-emc.yml @@ -9,14 +9,14 @@ - role: core/ntp - role: apt-repo/spreadspace - role: nginx/base - - role: monitoring/prometheus/exporter +# - role: monitoring/prometheus/exporter - import_playbook: ../common/kubernetes-cluster-layout.yml vars: kubernetes_cluster_layout: nodes_group: k8s-emc controlplane_nodes: - - emc-ctrl + - ele-emc-ctrl ### hack hack hack... - name: cook kubernetes secrets -- cgit v1.2.3