Update nat rule number for adguard server

inventory.yaml

@@ -59,14 +59,13 @@ en1:
             interface:
               access: bond0
               internal: bond0.99
-          skylab_datastore_device: sdb
           skylab_networking:
             eno1:
               bond: bond0
             eno2:
               bond: bond0
             bond0:
-              device: bond
+              type: bond
               firewall: internal
               gateway: 10.42.101.1/24
               dns:
@@ -76,7 +75,7 @@ en1:
                 - 192.168.255.255/32
               dhcp: false
             bond0.99:
-              device: vlan
+              type: vlan
               firewall: trusted
               addresses:
                 - 192.168.42.10/24
@@ -102,7 +101,7 @@ en1:
             eno2:
               bond: bond0
             bond0:
-              device: bond
+              type: bond
               firewall: internal
               dhcp: false
               gateway: 10.42.101.1/24
@@ -112,7 +111,7 @@ en1:
               dns:
                 - 10.42.101.1
             bond0.99:
-              device: vlan
+              type: vlan
               firewall: trusted
               dhcp: false
               addresses:
@@ -139,7 +138,7 @@ en1:
             eno2:
               bond: bond0
             bond0:
-              device: bond
+              type: bond
               firewall: internal
               gateway: 10.42.101.1/24
               dns:
@@ -149,7 +148,7 @@ en1:
                 - 192.168.255.255/32
               dhcp: false
             bond0.99:
-              device: vlan
+              type: vlan
               firewall: trusted
               addresses:
                 - 192.168.42.30/24

playbooks/files

@@ -0,0 +1 @@
+../resources

playbooks/roles

@@ -0,0 +1 @@
+../roles

playbooks/tasks

@@ -0,0 +1 @@
+../tasks

playbooks/templates

@@ -0,0 +1 @@
+../resources

playbooks/vars

@@ -0,0 +1 @@
+../vars/

pyproject.toml

@@ -7,7 +7,7 @@ license = "MIT"
 
 [tool.poetry.dependencies]
 python = "^3.8"
-ansible = "^4.9.0"
+ansible = "^3.4.0"
 docker = "^4.2.0"
 docker-compose = "^1.25.4"
 paramiko = "^2.7.1"

requirements.yml

@@ -1,4 +0,0 @@
----
-collections:
-  - source: ./skylab/
-    type: subdirs

skylab/core/README.md

@@ -1,3 +0,0 @@
-# Ansible Collection - skylab.core
-
-Documentation for the collection.

skylab/core/galaxy.yml

@@ -1,19 +0,0 @@
----
-namespace: skylab
-name: core
-version: 0.0.0
-description: Network deployment procedures and configuration state management
-authors:
-  - Ethan Paul <me@enp.one>
-license:
-  - MIT
-readme: README.md
-tags: []
-repository: https://vcs.enp.one/skylab/skylab-ansible/
-build_ignore: []
-
-# Collections that this collection requires to be installed for it to be usable. The key of the dict is the
-# collection label 'namespace.name'. The value is a version range
-# L(specifiers,https://python-semanticversion.readthedocs.io/en/latest/#requirement-specification). Multiple version
-# range specifiers can be set and are separated by ','
-dependencies: {}

skylab/core/meta/runtime.yml

@@ -1,2 +0,0 @@
----
-requires_ansible: ">=2.11,<2.15"