From eda7ec6fd7856a6bffe5108a930192e7c10782f7 Mon Sep 17 00:00:00 2001 From: josiah Date: Sun, 12 Apr 2020 16:27:42 -0500 Subject: [PATCH] Remove unecessary plays / hosts. --- ansible/all.yml | 24 +++++++------------- ansible/hosts.yml | 5 +---- ansible/roles/home-net/tasks/onprem.yml | 29 ------------------------- 3 files changed, 9 insertions(+), 49 deletions(-) diff --git a/ansible/all.yml b/ansible/all.yml index 9fe2d42..8eae348 100644 --- a/ansible/all.yml +++ b/ansible/all.yml @@ -1,28 +1,20 @@ --- -- name: on prem base server config - hosts: onprem_servers - tasks: - - debug: msg="deploying base server config." - roles: - - { name: home-net } - -- name: on prem wg config - hosts: onprem_servers - tasks: - - debug: msg="Deploying wg." - roles: - - { name: wg_vpn } - - name: cloud wg config hosts: vpn tasks: - debug: msg="Deploying wg to cloud server" roles: - - { name: wg_vpn } + - { name: wg_vpn, tags: ['wg_vpn'] } - name: deploy the awful stack hosts: prod tasks: - debug: msg="Deploying awful stack to cloud server" roles: - - { name: awfulAll } + - { name: awfulAll, tags: ['awfulAll'] } + + +- name: Deploy mediaserver + hosts: mediaserver + roles: + - { name: mediaserver, tags: ['mediaserver'] } diff --git a/ansible/hosts.yml b/ansible/hosts.yml index 951bbf5..058960a 100644 --- a/ansible/hosts.yml +++ b/ansible/hosts.yml @@ -15,9 +15,6 @@ all: hydra-ling: lurker-ling: ling-bane: - onprem_servers: - hosts: - hatchery: - mediaservers: + mediaserver: hosts: hatchery: diff --git a/ansible/roles/home-net/tasks/onprem.yml b/ansible/roles/home-net/tasks/onprem.yml index 867dc35..e69de29 100644 --- a/ansible/roles/home-net/tasks/onprem.yml +++ b/ansible/roles/home-net/tasks/onprem.yml @@ -1,29 +0,0 @@ -- name: Install aptitude using apt - apt: name=aptitude state=latest update_cache=yes force_apt_get=yes - -- name: Install required system packages for docker install - apt: name={{ item }} state=latest update_cache=yes - loop: [ 'apt-transport-https', 'ca-certificates', 'software-properties-common' ] - -- name: Add Docker GPG apt Key - apt_key: - url: https://download.docker.com/linux/debian/gpg - state: present - -- name: Add Docker Repository - apt_repository: - repo: deb https://download.docker.com/linux/ubuntu bionic stable - state: present - -- name: Update apt - apt: update_cache=yes - -- name: Install required system packages - apt: name={{ sys_packages }} state=latest - -- name: add 'josiah' to docker group - user: - name='josiah' - groups=docker - append=yes -