From 2814d42148994aab11de750ae42829bbe2596879 Mon Sep 17 00:00:00 2001 From: Ethan Paul Date: Tue, 7 Sep 2021 20:31:18 -0400 Subject: [PATCH] Add network infrastructure Add network group for filtering network hosts Add network target for auth'ing to network hosts Update playbooks to filter out network targets --- inventory.yaml | 12 ++++++++++++ playbooks/provision.yaml | 6 +++--- playbooks/update.yaml | 4 ++-- vars/access.yaml | 4 ++-- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/inventory.yaml b/inventory.yaml index 9200f46..5311413 100644 --- a/inventory.yaml +++ b/inventory.yaml @@ -7,6 +7,18 @@ all: ansible_user: ansible ansible_ssh_common_args: "-o ControlMaster=auto -o ControlPersist=60s -o ForwardAgent=yes" +en1: + vars: + skylab_location: Newton MA + children: + network: + hosts: + core: + ansible_host: core.net.enp.one + ansible_port: 4242 + skylab_description: Core Router + skylab_targets: [network] + en2: vars: skylab_location: DigitalOcean NYC1 diff --git a/playbooks/provision.yaml b/playbooks/provision.yaml index 74ab9cc..15ac0a7 100644 --- a/playbooks/provision.yaml +++ b/playbooks/provision.yaml @@ -1,6 +1,6 @@ --- - name: Bootstrap remote ansible environment - hosts: all + hosts: all,!network,!network tags: - always tasks: @@ -51,7 +51,7 @@ - name: Configure common server settings - hosts: all + hosts: all,!network vars_files: - vars/packages.yaml tasks: @@ -104,7 +104,7 @@ - name: Configure SSH - hosts: all + hosts: all,!network handlers: - name: restart-sshd become: true diff --git a/playbooks/update.yaml b/playbooks/update.yaml index fe37f3f..11aba6b 100644 --- a/playbooks/update.yaml +++ b/playbooks/update.yaml @@ -1,6 +1,6 @@ --- - name: Update system - hosts: all + hosts: all,!network tags: - packages vars_files: @@ -14,7 +14,7 @@ state: latest - name: Update unix accounts - hosts: all + hosts: all,!network tags: - accounts - access diff --git a/vars/access.yaml b/vars/access.yaml index 43faccd..bca2142 100644 --- a/vars/access.yaml +++ b/vars/access.yaml @@ -3,13 +3,13 @@ skylab_accounts: - name: enpaul uid: 1300 fullname: Ethan N. Paul - targets: [cloud] + targets: [cloud, network] admin: true password: $y$j9T$cWkd9aGj4sNepyJm5NVZl0$yBhFy3cN3syM8r4doGYnsLZhsaTLQVoDIBs2kkXtxY2 - name: ansible uid: 1400 - targets: [cloud] + targets: [cloud, network] admin: true service: true password: $y$j9T$w/pIBtZIMo3PmXccZ.LHi1$AbMVIks.P10CyuK8tWt21O4JuLpKGpWTFgX0WlTbiw6