From 3001e19c7ec608be1bb208bcd9e9434230e75317 Mon Sep 17 00:00:00 2001 From: Ethan Paul Date: Sat, 11 Dec 2021 15:56:53 -0500 Subject: [PATCH] Restructore project into collection --- playbooks/files | 1 - playbooks/roles | 1 - playbooks/tasks | 1 - playbooks/templates | 1 - playbooks/vars | 1 - requirements.yml | 4 ++++ skylab/core/README.md | 3 +++ skylab/core/galaxy.yml | 19 +++++++++++++++++++ skylab/core/meta/runtime.yml | 2 ++ .../core/playbooks}/configure.yaml | 0 .../core/playbooks}/deploy.yaml | 0 .../core/playbooks/files}/global.sh | 0 .../playbooks/files}/remote-requirements.txt | 0 .../core/playbooks}/node-down.yaml | 0 .../core/playbooks}/node-poweroff.yaml | 0 .../core/playbooks}/node-up.yaml | 0 .../core/playbooks}/provision.yaml | 0 .../tasks}/meta/bootstrap-remote-env.yaml | 0 .../meta/runtime-group-determination.yaml | 0 .../templates}/docker-compose/adguard.yaml.j2 | 0 .../docker-compose/bitwarden.yaml.j2 | 0 .../templates}/docker-compose/gitea.yaml.j2 | 0 .../templates}/docker-compose/meta.yaml.j2 | 0 .../docker-compose/minecraft.yaml.j2 | 0 .../templates}/docker-compose/plex.yaml.j2 | 0 .../templates}/docker-compose/unifi.yaml.j2 | 0 .../templates}/docker-compose/vikunja.yaml.j2 | 0 .../core/playbooks}/update.yaml | 0 .../core/playbooks/vars}/access.yaml | 0 .../core/playbooks/vars}/packages.yaml | 0 .../core/playbooks/vars}/services.yaml | 0 .../core/playbooks/vars}/sshkeys.yaml | 0 .../core/roles}/dashboard/files/grafana.ini | 0 .../core/roles}/dashboard/files/grafana.repo | 0 .../roles}/dashboard/files/ssl-options.conf | 0 .../core/roles}/dashboard/handlers/main.yaml | 0 .../core/roles}/dashboard/tasks/grafana.yaml | 0 .../core/roles}/dashboard/tasks/main.yaml | 0 .../core/roles}/dashboard/tasks/nginx.yaml | 0 .../roles}/dashboard/templates/nginx.conf.j2 | 0 .../core/roles}/dashboard/vars/main.yaml | 0 .../roles}/datastore/meta/argument_specs.yaml | 0 .../core/roles}/datastore/tasks/gluster.yaml | 0 .../core/roles}/datastore/tasks/main.yaml | 0 .../core/roles}/datastore/tasks/mounts.yaml | 0 .../core/roles}/datastore/tasks/packages.yaml | 0 .../core/roles}/server/handlers/main.yaml | 0 .../core/roles}/server/tasks/firewalld.yaml | 0 .../core/roles}/server/tasks/hosts.yaml | 0 .../core/roles}/server/tasks/main.yaml | 0 .../core/roles}/server/tasks/networkd.yaml | 0 .../core/roles}/server/tasks/sshd.yaml | 0 .../core/roles}/server/tasks/sudoers.yaml | 0 .../core/roles}/server/templates/motd.j2 | 0 .../core/roles}/server/templates/netdev.j2 | 0 .../core/roles}/server/templates/network.j2 | 0 .../core/roles}/swarm/tasks/check.yaml | 0 .../core/roles}/swarm/tasks/configure.yaml | 0 .../core/roles}/swarm/tasks/gluster.yaml | 0 .../core/roles}/swarm/tasks/install.yaml | 0 .../core/roles}/swarm/tasks/join.yaml | 0 .../core/roles}/swarm/tasks/main.yaml | 0 .../roles}/swarm/templates/daemon.json.j2 | 0 63 files changed, 28 insertions(+), 5 deletions(-) delete mode 120000 playbooks/files delete mode 120000 playbooks/roles delete mode 120000 playbooks/tasks delete mode 120000 playbooks/templates delete mode 120000 playbooks/vars create mode 100644 requirements.yml create mode 100644 skylab/core/README.md create mode 100644 skylab/core/galaxy.yml create mode 100644 skylab/core/meta/runtime.yml rename {playbooks => skylab/core/playbooks}/configure.yaml (100%) rename {playbooks => skylab/core/playbooks}/deploy.yaml (100%) rename {resources => skylab/core/playbooks/files}/global.sh (100%) rename {resources => skylab/core/playbooks/files}/remote-requirements.txt (100%) rename {playbooks => skylab/core/playbooks}/node-down.yaml (100%) rename {playbooks => skylab/core/playbooks}/node-poweroff.yaml (100%) rename {playbooks => skylab/core/playbooks}/node-up.yaml (100%) rename {playbooks => skylab/core/playbooks}/provision.yaml (100%) rename {tasks => skylab/core/playbooks/tasks}/meta/bootstrap-remote-env.yaml (100%) rename {tasks => skylab/core/playbooks/tasks}/meta/runtime-group-determination.yaml (100%) rename {resources => skylab/core/playbooks/templates}/docker-compose/adguard.yaml.j2 (100%) rename {resources => skylab/core/playbooks/templates}/docker-compose/bitwarden.yaml.j2 (100%) rename {resources => skylab/core/playbooks/templates}/docker-compose/gitea.yaml.j2 (100%) rename {resources => skylab/core/playbooks/templates}/docker-compose/meta.yaml.j2 (100%) rename {resources => skylab/core/playbooks/templates}/docker-compose/minecraft.yaml.j2 (100%) rename {resources => skylab/core/playbooks/templates}/docker-compose/plex.yaml.j2 (100%) rename {resources => skylab/core/playbooks/templates}/docker-compose/unifi.yaml.j2 (100%) rename {resources => skylab/core/playbooks/templates}/docker-compose/vikunja.yaml.j2 (100%) rename {playbooks => skylab/core/playbooks}/update.yaml (100%) rename {vars => skylab/core/playbooks/vars}/access.yaml (100%) rename {vars => skylab/core/playbooks/vars}/packages.yaml (100%) rename {vars => skylab/core/playbooks/vars}/services.yaml (100%) rename {vars => skylab/core/playbooks/vars}/sshkeys.yaml (100%) rename {roles => skylab/core/roles}/dashboard/files/grafana.ini (100%) rename {roles => skylab/core/roles}/dashboard/files/grafana.repo (100%) rename {roles => skylab/core/roles}/dashboard/files/ssl-options.conf (100%) rename {roles => skylab/core/roles}/dashboard/handlers/main.yaml (100%) rename {roles => skylab/core/roles}/dashboard/tasks/grafana.yaml (100%) rename {roles => skylab/core/roles}/dashboard/tasks/main.yaml (100%) rename {roles => skylab/core/roles}/dashboard/tasks/nginx.yaml (100%) rename {roles => skylab/core/roles}/dashboard/templates/nginx.conf.j2 (100%) rename {roles => skylab/core/roles}/dashboard/vars/main.yaml (100%) rename {roles => skylab/core/roles}/datastore/meta/argument_specs.yaml (100%) rename {roles => skylab/core/roles}/datastore/tasks/gluster.yaml (100%) rename {roles => skylab/core/roles}/datastore/tasks/main.yaml (100%) rename {roles => skylab/core/roles}/datastore/tasks/mounts.yaml (100%) rename {roles => skylab/core/roles}/datastore/tasks/packages.yaml (100%) rename {roles => skylab/core/roles}/server/handlers/main.yaml (100%) rename {roles => skylab/core/roles}/server/tasks/firewalld.yaml (100%) rename {roles => skylab/core/roles}/server/tasks/hosts.yaml (100%) rename {roles => skylab/core/roles}/server/tasks/main.yaml (100%) rename {roles => skylab/core/roles}/server/tasks/networkd.yaml (100%) rename {roles => skylab/core/roles}/server/tasks/sshd.yaml (100%) rename {roles => skylab/core/roles}/server/tasks/sudoers.yaml (100%) rename {roles => skylab/core/roles}/server/templates/motd.j2 (100%) rename {roles => skylab/core/roles}/server/templates/netdev.j2 (100%) rename {roles => skylab/core/roles}/server/templates/network.j2 (100%) rename {roles => skylab/core/roles}/swarm/tasks/check.yaml (100%) rename {roles => skylab/core/roles}/swarm/tasks/configure.yaml (100%) rename {roles => skylab/core/roles}/swarm/tasks/gluster.yaml (100%) rename {roles => skylab/core/roles}/swarm/tasks/install.yaml (100%) rename {roles => skylab/core/roles}/swarm/tasks/join.yaml (100%) rename {roles => skylab/core/roles}/swarm/tasks/main.yaml (100%) rename {roles => skylab/core/roles}/swarm/templates/daemon.json.j2 (100%) diff --git a/playbooks/files b/playbooks/files deleted file mode 120000 index 35a4f7a..0000000 --- a/playbooks/files +++ /dev/null @@ -1 +0,0 @@ -../resources \ No newline at end of file diff --git a/playbooks/roles b/playbooks/roles deleted file mode 120000 index d8c4472..0000000 --- a/playbooks/roles +++ /dev/null @@ -1 +0,0 @@ -../roles \ No newline at end of file diff --git a/playbooks/tasks b/playbooks/tasks deleted file mode 120000 index f82457b..0000000 --- a/playbooks/tasks +++ /dev/null @@ -1 +0,0 @@ -../tasks \ No newline at end of file diff --git a/playbooks/templates b/playbooks/templates deleted file mode 120000 index 35a4f7a..0000000 --- a/playbooks/templates +++ /dev/null @@ -1 +0,0 @@ -../resources \ No newline at end of file diff --git a/playbooks/vars b/playbooks/vars deleted file mode 120000 index b11f011..0000000 --- a/playbooks/vars +++ /dev/null @@ -1 +0,0 @@ -../vars/ \ No newline at end of file diff --git a/requirements.yml b/requirements.yml new file mode 100644 index 0000000..6f21104 --- /dev/null +++ b/requirements.yml @@ -0,0 +1,4 @@ +--- +collections: + - source: ./skylab/ + type: subdirs diff --git a/skylab/core/README.md b/skylab/core/README.md new file mode 100644 index 0000000..cbc8c17 --- /dev/null +++ b/skylab/core/README.md @@ -0,0 +1,3 @@ +# Ansible Collection - skylab.core + +Documentation for the collection. diff --git a/skylab/core/galaxy.yml b/skylab/core/galaxy.yml new file mode 100644 index 0000000..abd8de7 --- /dev/null +++ b/skylab/core/galaxy.yml @@ -0,0 +1,19 @@ +--- +namespace: skylab +name: core +version: 0.0.0 +description: Network deployment procedures and configuration state management +authors: + - Ethan Paul +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: {} diff --git a/skylab/core/meta/runtime.yml b/skylab/core/meta/runtime.yml new file mode 100644 index 0000000..7d6692a --- /dev/null +++ b/skylab/core/meta/runtime.yml @@ -0,0 +1,2 @@ +--- +requires_ansible: ">=2.11,<2.15" diff --git a/playbooks/configure.yaml b/skylab/core/playbooks/configure.yaml similarity index 100% rename from playbooks/configure.yaml rename to skylab/core/playbooks/configure.yaml diff --git a/playbooks/deploy.yaml b/skylab/core/playbooks/deploy.yaml similarity index 100% rename from playbooks/deploy.yaml rename to skylab/core/playbooks/deploy.yaml diff --git a/resources/global.sh b/skylab/core/playbooks/files/global.sh similarity index 100% rename from resources/global.sh rename to skylab/core/playbooks/files/global.sh diff --git a/resources/remote-requirements.txt b/skylab/core/playbooks/files/remote-requirements.txt similarity index 100% rename from resources/remote-requirements.txt rename to skylab/core/playbooks/files/remote-requirements.txt diff --git a/playbooks/node-down.yaml b/skylab/core/playbooks/node-down.yaml similarity index 100% rename from playbooks/node-down.yaml rename to skylab/core/playbooks/node-down.yaml diff --git a/playbooks/node-poweroff.yaml b/skylab/core/playbooks/node-poweroff.yaml similarity index 100% rename from playbooks/node-poweroff.yaml rename to skylab/core/playbooks/node-poweroff.yaml diff --git a/playbooks/node-up.yaml b/skylab/core/playbooks/node-up.yaml similarity index 100% rename from playbooks/node-up.yaml rename to skylab/core/playbooks/node-up.yaml diff --git a/playbooks/provision.yaml b/skylab/core/playbooks/provision.yaml similarity index 100% rename from playbooks/provision.yaml rename to skylab/core/playbooks/provision.yaml diff --git a/tasks/meta/bootstrap-remote-env.yaml b/skylab/core/playbooks/tasks/meta/bootstrap-remote-env.yaml similarity index 100% rename from tasks/meta/bootstrap-remote-env.yaml rename to skylab/core/playbooks/tasks/meta/bootstrap-remote-env.yaml diff --git a/tasks/meta/runtime-group-determination.yaml b/skylab/core/playbooks/tasks/meta/runtime-group-determination.yaml similarity index 100% rename from tasks/meta/runtime-group-determination.yaml rename to skylab/core/playbooks/tasks/meta/runtime-group-determination.yaml diff --git a/resources/docker-compose/adguard.yaml.j2 b/skylab/core/playbooks/templates/docker-compose/adguard.yaml.j2 similarity index 100% rename from resources/docker-compose/adguard.yaml.j2 rename to skylab/core/playbooks/templates/docker-compose/adguard.yaml.j2 diff --git a/resources/docker-compose/bitwarden.yaml.j2 b/skylab/core/playbooks/templates/docker-compose/bitwarden.yaml.j2 similarity index 100% rename from resources/docker-compose/bitwarden.yaml.j2 rename to skylab/core/playbooks/templates/docker-compose/bitwarden.yaml.j2 diff --git a/resources/docker-compose/gitea.yaml.j2 b/skylab/core/playbooks/templates/docker-compose/gitea.yaml.j2 similarity index 100% rename from resources/docker-compose/gitea.yaml.j2 rename to skylab/core/playbooks/templates/docker-compose/gitea.yaml.j2 diff --git a/resources/docker-compose/meta.yaml.j2 b/skylab/core/playbooks/templates/docker-compose/meta.yaml.j2 similarity index 100% rename from resources/docker-compose/meta.yaml.j2 rename to skylab/core/playbooks/templates/docker-compose/meta.yaml.j2 diff --git a/resources/docker-compose/minecraft.yaml.j2 b/skylab/core/playbooks/templates/docker-compose/minecraft.yaml.j2 similarity index 100% rename from resources/docker-compose/minecraft.yaml.j2 rename to skylab/core/playbooks/templates/docker-compose/minecraft.yaml.j2 diff --git a/resources/docker-compose/plex.yaml.j2 b/skylab/core/playbooks/templates/docker-compose/plex.yaml.j2 similarity index 100% rename from resources/docker-compose/plex.yaml.j2 rename to skylab/core/playbooks/templates/docker-compose/plex.yaml.j2 diff --git a/resources/docker-compose/unifi.yaml.j2 b/skylab/core/playbooks/templates/docker-compose/unifi.yaml.j2 similarity index 100% rename from resources/docker-compose/unifi.yaml.j2 rename to skylab/core/playbooks/templates/docker-compose/unifi.yaml.j2 diff --git a/resources/docker-compose/vikunja.yaml.j2 b/skylab/core/playbooks/templates/docker-compose/vikunja.yaml.j2 similarity index 100% rename from resources/docker-compose/vikunja.yaml.j2 rename to skylab/core/playbooks/templates/docker-compose/vikunja.yaml.j2 diff --git a/playbooks/update.yaml b/skylab/core/playbooks/update.yaml similarity index 100% rename from playbooks/update.yaml rename to skylab/core/playbooks/update.yaml diff --git a/vars/access.yaml b/skylab/core/playbooks/vars/access.yaml similarity index 100% rename from vars/access.yaml rename to skylab/core/playbooks/vars/access.yaml diff --git a/vars/packages.yaml b/skylab/core/playbooks/vars/packages.yaml similarity index 100% rename from vars/packages.yaml rename to skylab/core/playbooks/vars/packages.yaml diff --git a/vars/services.yaml b/skylab/core/playbooks/vars/services.yaml similarity index 100% rename from vars/services.yaml rename to skylab/core/playbooks/vars/services.yaml diff --git a/vars/sshkeys.yaml b/skylab/core/playbooks/vars/sshkeys.yaml similarity index 100% rename from vars/sshkeys.yaml rename to skylab/core/playbooks/vars/sshkeys.yaml diff --git a/roles/dashboard/files/grafana.ini b/skylab/core/roles/dashboard/files/grafana.ini similarity index 100% rename from roles/dashboard/files/grafana.ini rename to skylab/core/roles/dashboard/files/grafana.ini diff --git a/roles/dashboard/files/grafana.repo b/skylab/core/roles/dashboard/files/grafana.repo similarity index 100% rename from roles/dashboard/files/grafana.repo rename to skylab/core/roles/dashboard/files/grafana.repo diff --git a/roles/dashboard/files/ssl-options.conf b/skylab/core/roles/dashboard/files/ssl-options.conf similarity index 100% rename from roles/dashboard/files/ssl-options.conf rename to skylab/core/roles/dashboard/files/ssl-options.conf diff --git a/roles/dashboard/handlers/main.yaml b/skylab/core/roles/dashboard/handlers/main.yaml similarity index 100% rename from roles/dashboard/handlers/main.yaml rename to skylab/core/roles/dashboard/handlers/main.yaml diff --git a/roles/dashboard/tasks/grafana.yaml b/skylab/core/roles/dashboard/tasks/grafana.yaml similarity index 100% rename from roles/dashboard/tasks/grafana.yaml rename to skylab/core/roles/dashboard/tasks/grafana.yaml diff --git a/roles/dashboard/tasks/main.yaml b/skylab/core/roles/dashboard/tasks/main.yaml similarity index 100% rename from roles/dashboard/tasks/main.yaml rename to skylab/core/roles/dashboard/tasks/main.yaml diff --git a/roles/dashboard/tasks/nginx.yaml b/skylab/core/roles/dashboard/tasks/nginx.yaml similarity index 100% rename from roles/dashboard/tasks/nginx.yaml rename to skylab/core/roles/dashboard/tasks/nginx.yaml diff --git a/roles/dashboard/templates/nginx.conf.j2 b/skylab/core/roles/dashboard/templates/nginx.conf.j2 similarity index 100% rename from roles/dashboard/templates/nginx.conf.j2 rename to skylab/core/roles/dashboard/templates/nginx.conf.j2 diff --git a/roles/dashboard/vars/main.yaml b/skylab/core/roles/dashboard/vars/main.yaml similarity index 100% rename from roles/dashboard/vars/main.yaml rename to skylab/core/roles/dashboard/vars/main.yaml diff --git a/roles/datastore/meta/argument_specs.yaml b/skylab/core/roles/datastore/meta/argument_specs.yaml similarity index 100% rename from roles/datastore/meta/argument_specs.yaml rename to skylab/core/roles/datastore/meta/argument_specs.yaml diff --git a/roles/datastore/tasks/gluster.yaml b/skylab/core/roles/datastore/tasks/gluster.yaml similarity index 100% rename from roles/datastore/tasks/gluster.yaml rename to skylab/core/roles/datastore/tasks/gluster.yaml diff --git a/roles/datastore/tasks/main.yaml b/skylab/core/roles/datastore/tasks/main.yaml similarity index 100% rename from roles/datastore/tasks/main.yaml rename to skylab/core/roles/datastore/tasks/main.yaml diff --git a/roles/datastore/tasks/mounts.yaml b/skylab/core/roles/datastore/tasks/mounts.yaml similarity index 100% rename from roles/datastore/tasks/mounts.yaml rename to skylab/core/roles/datastore/tasks/mounts.yaml diff --git a/roles/datastore/tasks/packages.yaml b/skylab/core/roles/datastore/tasks/packages.yaml similarity index 100% rename from roles/datastore/tasks/packages.yaml rename to skylab/core/roles/datastore/tasks/packages.yaml diff --git a/roles/server/handlers/main.yaml b/skylab/core/roles/server/handlers/main.yaml similarity index 100% rename from roles/server/handlers/main.yaml rename to skylab/core/roles/server/handlers/main.yaml diff --git a/roles/server/tasks/firewalld.yaml b/skylab/core/roles/server/tasks/firewalld.yaml similarity index 100% rename from roles/server/tasks/firewalld.yaml rename to skylab/core/roles/server/tasks/firewalld.yaml diff --git a/roles/server/tasks/hosts.yaml b/skylab/core/roles/server/tasks/hosts.yaml similarity index 100% rename from roles/server/tasks/hosts.yaml rename to skylab/core/roles/server/tasks/hosts.yaml diff --git a/roles/server/tasks/main.yaml b/skylab/core/roles/server/tasks/main.yaml similarity index 100% rename from roles/server/tasks/main.yaml rename to skylab/core/roles/server/tasks/main.yaml diff --git a/roles/server/tasks/networkd.yaml b/skylab/core/roles/server/tasks/networkd.yaml similarity index 100% rename from roles/server/tasks/networkd.yaml rename to skylab/core/roles/server/tasks/networkd.yaml diff --git a/roles/server/tasks/sshd.yaml b/skylab/core/roles/server/tasks/sshd.yaml similarity index 100% rename from roles/server/tasks/sshd.yaml rename to skylab/core/roles/server/tasks/sshd.yaml diff --git a/roles/server/tasks/sudoers.yaml b/skylab/core/roles/server/tasks/sudoers.yaml similarity index 100% rename from roles/server/tasks/sudoers.yaml rename to skylab/core/roles/server/tasks/sudoers.yaml diff --git a/roles/server/templates/motd.j2 b/skylab/core/roles/server/templates/motd.j2 similarity index 100% rename from roles/server/templates/motd.j2 rename to skylab/core/roles/server/templates/motd.j2 diff --git a/roles/server/templates/netdev.j2 b/skylab/core/roles/server/templates/netdev.j2 similarity index 100% rename from roles/server/templates/netdev.j2 rename to skylab/core/roles/server/templates/netdev.j2 diff --git a/roles/server/templates/network.j2 b/skylab/core/roles/server/templates/network.j2 similarity index 100% rename from roles/server/templates/network.j2 rename to skylab/core/roles/server/templates/network.j2 diff --git a/roles/swarm/tasks/check.yaml b/skylab/core/roles/swarm/tasks/check.yaml similarity index 100% rename from roles/swarm/tasks/check.yaml rename to skylab/core/roles/swarm/tasks/check.yaml diff --git a/roles/swarm/tasks/configure.yaml b/skylab/core/roles/swarm/tasks/configure.yaml similarity index 100% rename from roles/swarm/tasks/configure.yaml rename to skylab/core/roles/swarm/tasks/configure.yaml diff --git a/roles/swarm/tasks/gluster.yaml b/skylab/core/roles/swarm/tasks/gluster.yaml similarity index 100% rename from roles/swarm/tasks/gluster.yaml rename to skylab/core/roles/swarm/tasks/gluster.yaml diff --git a/roles/swarm/tasks/install.yaml b/skylab/core/roles/swarm/tasks/install.yaml similarity index 100% rename from roles/swarm/tasks/install.yaml rename to skylab/core/roles/swarm/tasks/install.yaml diff --git a/roles/swarm/tasks/join.yaml b/skylab/core/roles/swarm/tasks/join.yaml similarity index 100% rename from roles/swarm/tasks/join.yaml rename to skylab/core/roles/swarm/tasks/join.yaml diff --git a/roles/swarm/tasks/main.yaml b/skylab/core/roles/swarm/tasks/main.yaml similarity index 100% rename from roles/swarm/tasks/main.yaml rename to skylab/core/roles/swarm/tasks/main.yaml diff --git a/roles/swarm/templates/daemon.json.j2 b/skylab/core/roles/swarm/templates/daemon.json.j2 similarity index 100% rename from roles/swarm/templates/daemon.json.j2 rename to skylab/core/roles/swarm/templates/daemon.json.j2