diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c12be9a..bc637ca 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: hooks: - id: ansible-galaxy-install name: Install ansible-galaxy collections - entry: ansible-galaxy collection install -r requirements.yml + entry: ansible-galaxy collection install -r requirements.yaml language: system pass_filenames: false always_run: true @@ -18,6 +18,6 @@ repos: rev: v6.22.2 hooks: - id: ansible-lint - files: \.(yaml|yml)$ + files: \.(yaml)$ additional_dependencies: - ansible-core==2.15.8 diff --git a/ansible.cfg b/ansible.cfg index b1a385e..738fcd6 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -14,7 +14,7 @@ vault_password_file=/media/veracrypt1/scripts/ansible_vault.sh # (list) Check all of these extensions when looking for 'variable' files which should be YAML or JSON or vaulted versions of these. # This affects vars_files, include_vars, inventory and vars plugins among others. -yaml_valid_extensions=.yml +yaml_valid_extensions=.yaml # (boolean) Set this to "False" if you want to avoid host key checking by the underlying tools Ansible uses to connect to the host host_key_checking=False diff --git a/playbooks/docker-host.yml b/playbooks/docker-host.yaml similarity index 100% rename from playbooks/docker-host.yml rename to playbooks/docker-host.yaml diff --git a/playbooks/docker-lb.yml b/playbooks/docker-lb.yaml similarity index 100% rename from playbooks/docker-lb.yml rename to playbooks/docker-lb.yaml diff --git a/playbooks/docker.yaml b/playbooks/docker.yaml new file mode 100644 index 0000000..db0ebba --- /dev/null +++ b/playbooks/docker.yaml @@ -0,0 +1,5 @@ +--- +- name: Setup Docker Hosts + ansible.builtin.import_playbook: docker-host.yaml +- name: Setup Docker load balancer + ansible.builtin.import_playbook: docker-lb.yaml diff --git a/playbooks/docker.yml b/playbooks/docker.yml deleted file mode 100644 index 3065b90..0000000 --- a/playbooks/docker.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: Setup Docker Hosts - ansible.builtin.import_playbook: docker-host.yml -- name: Setup Docker load balancer - ansible.builtin.import_playbook: docker-lb.yml diff --git a/playbooks/k3s-agents.yml b/playbooks/k3s-agents.yaml similarity index 100% rename from playbooks/k3s-agents.yml rename to playbooks/k3s-agents.yaml diff --git a/playbooks/k3s-loadbalancer.yml b/playbooks/k3s-loadbalancer.yaml similarity index 100% rename from playbooks/k3s-loadbalancer.yml rename to playbooks/k3s-loadbalancer.yaml diff --git a/playbooks/k3s-servers.yml b/playbooks/k3s-servers.yaml similarity index 100% rename from playbooks/k3s-servers.yml rename to playbooks/k3s-servers.yaml diff --git a/playbooks/k3s-storage.yml b/playbooks/k3s-storage.yaml similarity index 100% rename from playbooks/k3s-storage.yml rename to playbooks/k3s-storage.yaml diff --git a/playbooks/kubernetes_setup.yml b/playbooks/kubernetes_setup.yaml similarity index 100% rename from playbooks/kubernetes_setup.yml rename to playbooks/kubernetes_setup.yaml diff --git a/playbooks/proxmox.yml b/playbooks/proxmox.yaml similarity index 100% rename from playbooks/proxmox.yml rename to playbooks/proxmox.yaml diff --git a/requirements.yml b/requirements.yaml similarity index 100% rename from requirements.yml rename to requirements.yaml diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yaml similarity index 100% rename from roles/common/handlers/main.yml rename to roles/common/handlers/main.yaml diff --git a/roles/common/tasks/bash.yml b/roles/common/tasks/bash.yaml similarity index 100% rename from roles/common/tasks/bash.yml rename to roles/common/tasks/bash.yaml diff --git a/roles/common/tasks/extra_packages.yml b/roles/common/tasks/extra_packages.yaml similarity index 100% rename from roles/common/tasks/extra_packages.yml rename to roles/common/tasks/extra_packages.yaml diff --git a/roles/common/tasks/hostname.yml b/roles/common/tasks/hostname.yaml similarity index 100% rename from roles/common/tasks/hostname.yml rename to roles/common/tasks/hostname.yaml diff --git a/roles/common/tasks/main.yaml b/roles/common/tasks/main.yaml new file mode 100644 index 0000000..f41ab2c --- /dev/null +++ b/roles/common/tasks/main.yaml @@ -0,0 +1,13 @@ +--- +- name: Configure Time + ansible.builtin.include_tasks: time.yaml +- name: Configure Packages + ansible.builtin.include_tasks: packages.yaml +- name: Configure Hostname + ansible.builtin.include_tasks: hostname.yaml +- name: Configure Extra-Packages + ansible.builtin.include_tasks: extra_packages.yaml +- name: Configure Bash + ansible.builtin.include_tasks: bash.yaml +- name: Configure SSH + ansible.builtin.include_tasks: sshd.yaml diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml deleted file mode 100644 index b206178..0000000 --- a/roles/common/tasks/main.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- name: Configure Time - ansible.builtin.include_tasks: time.yml -- name: Configure Packages - ansible.builtin.include_tasks: packages.yml -- name: Configure Hostname - ansible.builtin.include_tasks: hostname.yml -- name: Configure Extra-Packages - ansible.builtin.include_tasks: extra_packages.yml -- name: Configure Bash - ansible.builtin.include_tasks: bash.yml -- name: Configure SSH - ansible.builtin.include_tasks: sshd.yml diff --git a/roles/common/tasks/packages.yml b/roles/common/tasks/packages.yaml similarity index 100% rename from roles/common/tasks/packages.yml rename to roles/common/tasks/packages.yaml diff --git a/roles/common/tasks/sshd.yml b/roles/common/tasks/sshd.yaml similarity index 100% rename from roles/common/tasks/sshd.yml rename to roles/common/tasks/sshd.yaml diff --git a/roles/common/tasks/time.yml b/roles/common/tasks/time.yaml similarity index 100% rename from roles/common/tasks/time.yml rename to roles/common/tasks/time.yaml diff --git a/roles/common/vars/main.yml b/roles/common/vars/main.yaml similarity index 100% rename from roles/common/vars/main.yml rename to roles/common/vars/main.yaml diff --git a/roles/docker_host/handlers/main.yml b/roles/docker_host/handlers/main.yaml similarity index 100% rename from roles/docker_host/handlers/main.yml rename to roles/docker_host/handlers/main.yaml diff --git a/roles/docker_host/tasks/10_setup.yml b/roles/docker_host/tasks/10_setup.yaml similarity index 100% rename from roles/docker_host/tasks/10_setup.yml rename to roles/docker_host/tasks/10_setup.yaml diff --git a/roles/docker_host/tasks/20_installation.yml b/roles/docker_host/tasks/20_installation.yaml similarity index 100% rename from roles/docker_host/tasks/20_installation.yml rename to roles/docker_host/tasks/20_installation.yaml diff --git a/roles/docker_host/tasks/30_user_group_setup.yml b/roles/docker_host/tasks/30_user_group_setup.yaml similarity index 100% rename from roles/docker_host/tasks/30_user_group_setup.yml rename to roles/docker_host/tasks/30_user_group_setup.yaml diff --git a/roles/docker_host/tasks/40_directory_setup.yml b/roles/docker_host/tasks/40_directory_setup.yaml similarity index 100% rename from roles/docker_host/tasks/40_directory_setup.yml rename to roles/docker_host/tasks/40_directory_setup.yaml diff --git a/roles/docker_host/tasks/50_provision.yml b/roles/docker_host/tasks/50_provision.yaml similarity index 100% rename from roles/docker_host/tasks/50_provision.yml rename to roles/docker_host/tasks/50_provision.yaml diff --git a/roles/docker_host/tasks/60_deploy_compose.yml b/roles/docker_host/tasks/60_deploy_compose.yaml similarity index 100% rename from roles/docker_host/tasks/60_deploy_compose.yml rename to roles/docker_host/tasks/60_deploy_compose.yaml diff --git a/roles/docker_host/tasks/70_export.yml b/roles/docker_host/tasks/70_export.yaml similarity index 100% rename from roles/docker_host/tasks/70_export.yml rename to roles/docker_host/tasks/70_export.yaml diff --git a/roles/docker_host/tasks/main.yaml b/roles/docker_host/tasks/main.yaml new file mode 100644 index 0000000..76e6fee --- /dev/null +++ b/roles/docker_host/tasks/main.yaml @@ -0,0 +1,21 @@ +--- +- name: Setup VM + ansible.builtin.include_tasks: 10_setup.yaml + +- name: Install docker + ansible.builtin.include_tasks: 20_installation.yaml + +- name: Setup user and group for docker + ansible.builtin.include_tasks: 30_user_group_setup.yaml + +- name: Setup directory structure for docker + ansible.builtin.include_tasks: 40_directory_setup.yaml + +# - name: Deploy configs +# ansible.builtin.include_tasks: 50_provision.yaml + +- name: Deploy docker compose + ansible.builtin.include_tasks: 60_deploy_compose.yaml + +- name: Publish metrics + ansible.builtin.include_tasks: 70_export.yaml diff --git a/roles/docker_host/tasks/main.yml b/roles/docker_host/tasks/main.yml deleted file mode 100644 index aa13276..0000000 --- a/roles/docker_host/tasks/main.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -- name: Setup VM - ansible.builtin.include_tasks: 10_setup.yml - -- name: Install docker - ansible.builtin.include_tasks: 20_installation.yml - -- name: Setup user and group for docker - ansible.builtin.include_tasks: 30_user_group_setup.yml - -- name: Setup directory structure for docker - ansible.builtin.include_tasks: 40_directory_setup.yml - -# - name: Deploy configs -# ansible.builtin.include_tasks: 50_provision.yml - -- name: Deploy docker compose - ansible.builtin.include_tasks: 60_deploy_compose.yml - -- name: Publish metrics - ansible.builtin.include_tasks: 70_export.yml diff --git a/roles/docker_host/vars/main.yml b/roles/docker_host/vars/main.yaml similarity index 100% rename from roles/docker_host/vars/main.yml rename to roles/docker_host/vars/main.yaml diff --git a/roles/k3s_agent/handlers/main.yml b/roles/k3s_agent/handlers/main.yaml similarity index 100% rename from roles/k3s_agent/handlers/main.yml rename to roles/k3s_agent/handlers/main.yaml diff --git a/roles/k3s_agent/tasks/installation.yml b/roles/k3s_agent/tasks/installation.yaml similarity index 100% rename from roles/k3s_agent/tasks/installation.yml rename to roles/k3s_agent/tasks/installation.yaml diff --git a/roles/k3s_agent/tasks/main.yaml b/roles/k3s_agent/tasks/main.yaml new file mode 100644 index 0000000..15ce2b4 --- /dev/null +++ b/roles/k3s_agent/tasks/main.yaml @@ -0,0 +1,3 @@ +--- +- name: Install k3s agent + include_tasks: installation.yaml diff --git a/roles/k3s_agent/tasks/main.yml b/roles/k3s_agent/tasks/main.yml deleted file mode 100644 index 6788f80..0000000 --- a/roles/k3s_agent/tasks/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: Install k3s agent - include_tasks: installation.yml diff --git a/roles/k3s_loadbalancer/handlers/main.yml b/roles/k3s_loadbalancer/handlers/main.yaml similarity index 100% rename from roles/k3s_loadbalancer/handlers/main.yml rename to roles/k3s_loadbalancer/handlers/main.yaml diff --git a/roles/k3s_loadbalancer/tasks/configuration.yml b/roles/k3s_loadbalancer/tasks/configuration.yaml similarity index 100% rename from roles/k3s_loadbalancer/tasks/configuration.yml rename to roles/k3s_loadbalancer/tasks/configuration.yaml diff --git a/roles/k3s_loadbalancer/tasks/installation.yml b/roles/k3s_loadbalancer/tasks/installation.yaml similarity index 100% rename from roles/k3s_loadbalancer/tasks/installation.yml rename to roles/k3s_loadbalancer/tasks/installation.yaml diff --git a/roles/k3s_loadbalancer/tasks/main.yml b/roles/k3s_loadbalancer/tasks/main.yaml similarity index 79% rename from roles/k3s_loadbalancer/tasks/main.yml rename to roles/k3s_loadbalancer/tasks/main.yaml index 8f4edd4..e17ec3b 100644 --- a/roles/k3s_loadbalancer/tasks/main.yml +++ b/roles/k3s_loadbalancer/tasks/main.yaml @@ -1,9 +1,9 @@ --- - name: Installation - ansible.builtin.include_tasks: installation.yml + ansible.builtin.include_tasks: installation.yaml - name: Configure - ansible.builtin.include_tasks: configuration.yml + ansible.builtin.include_tasks: configuration.yaml - name: Setup DNS on Netcup community.general.netcup_dns: diff --git a/roles/k3s_loadbalancer/vars/main.yml b/roles/k3s_loadbalancer/vars/main.yaml similarity index 100% rename from roles/k3s_loadbalancer/vars/main.yml rename to roles/k3s_loadbalancer/vars/main.yaml diff --git a/roles/k3s_server/handlers/main.yml b/roles/k3s_server/handlers/main.yaml similarity index 100% rename from roles/k3s_server/handlers/main.yml rename to roles/k3s_server/handlers/main.yaml diff --git a/roles/k3s_server/tasks/create_kubeconfig.yml b/roles/k3s_server/tasks/create_kubeconfig.yaml similarity index 100% rename from roles/k3s_server/tasks/create_kubeconfig.yml rename to roles/k3s_server/tasks/create_kubeconfig.yaml diff --git a/roles/k3s_server/tasks/main.yml b/roles/k3s_server/tasks/main.yaml similarity index 80% rename from roles/k3s_server/tasks/main.yml rename to roles/k3s_server/tasks/main.yaml index b25187d..75dc3d6 100644 --- a/roles/k3s_server/tasks/main.yml +++ b/roles/k3s_server/tasks/main.yaml @@ -14,16 +14,16 @@ register: k3s_status - name: Install primary k3s server - include_tasks: primary_installation.yml + include_tasks: primary_installation.yaml when: ansible_default_ipv4.address == k3s_primary_server_ip - name: Get token from primary k3s server - include_tasks: pull_token.yml + include_tasks: pull_token.yaml - name: Install seconary k3s servers - include_tasks: secondary_installation.yml + include_tasks: secondary_installation.yaml when: ansible_default_ipv4.address != k3s_primary_server_ip - name: Set kubeconfig on localhost - include_tasks: create_kubeconfig.yml + include_tasks: create_kubeconfig.yaml when: ansible_default_ipv4.address == k3s_primary_server_ip diff --git a/roles/k3s_server/tasks/primary_installation.yml b/roles/k3s_server/tasks/primary_installation.yaml similarity index 100% rename from roles/k3s_server/tasks/primary_installation.yml rename to roles/k3s_server/tasks/primary_installation.yaml diff --git a/roles/k3s_server/tasks/pull_token.yml b/roles/k3s_server/tasks/pull_token.yaml similarity index 100% rename from roles/k3s_server/tasks/pull_token.yml rename to roles/k3s_server/tasks/pull_token.yaml diff --git a/roles/k3s_server/tasks/secondary_installation.yml b/roles/k3s_server/tasks/secondary_installation.yaml similarity index 100% rename from roles/k3s_server/tasks/secondary_installation.yml rename to roles/k3s_server/tasks/secondary_installation.yaml diff --git a/roles/k3s_server/vars/main.yml b/roles/k3s_server/vars/main.yaml similarity index 90% rename from roles/k3s_server/vars/main.yml rename to roles/k3s_server/vars/main.yaml index a1deba1..b11ec28 100644 --- a/roles/k3s_server/vars/main.yml +++ b/roles/k3s_server/vars/main.yaml @@ -1 +1 @@ -k3s_server_token_vault_file: ../vars/group_vars/k3s/secrets_token.yml +k3s_server_token_vault_file: ../vars/group_vars/k3s/secrets_token.yaml diff --git a/roles/k3s_storage/handlers/main.yml b/roles/k3s_storage/handlers/main.yaml similarity index 100% rename from roles/k3s_storage/handlers/main.yml rename to roles/k3s_storage/handlers/main.yaml diff --git a/roles/k3s_storage/tasks/installation.yml b/roles/k3s_storage/tasks/installation.yaml similarity index 100% rename from roles/k3s_storage/tasks/installation.yml rename to roles/k3s_storage/tasks/installation.yaml diff --git a/roles/k3s_storage/tasks/main.yaml b/roles/k3s_storage/tasks/main.yaml new file mode 100644 index 0000000..7d6123a --- /dev/null +++ b/roles/k3s_storage/tasks/main.yaml @@ -0,0 +1,5 @@ +--- +- name: Install dependencies + ansible.builtin.include_tasks: requirements.yaml +- name: Install k3s + ansible.builtin.include_tasks: installation.yaml diff --git a/roles/k3s_storage/tasks/main.yml b/roles/k3s_storage/tasks/main.yml deleted file mode 100644 index 9ea328b..0000000 --- a/roles/k3s_storage/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: Install dependencies - ansible.builtin.include_tasks: requirements.yml -- name: Install k3s - ansible.builtin.include_tasks: installation.yml diff --git a/roles/k3s_storage/tasks/requirements.yml b/roles/k3s_storage/tasks/requirements.yaml similarity index 100% rename from roles/k3s_storage/tasks/requirements.yml rename to roles/k3s_storage/tasks/requirements.yaml diff --git a/roles/kubernetes_argocd/defaults/main.yml b/roles/kubernetes_argocd/defaults/main.yaml similarity index 100% rename from roles/kubernetes_argocd/defaults/main.yml rename to roles/kubernetes_argocd/defaults/main.yaml diff --git a/roles/kubernetes_argocd/tasks/main.yml b/roles/kubernetes_argocd/tasks/main.yaml similarity index 95% rename from roles/kubernetes_argocd/tasks/main.yml rename to roles/kubernetes_argocd/tasks/main.yaml index 29a628e..284695c 100644 --- a/roles/kubernetes_argocd/tasks/main.yml +++ b/roles/kubernetes_argocd/tasks/main.yaml @@ -33,7 +33,7 @@ - name: Apply ArgoCD Ingress kubernetes.core.k8s: - definition: "{{ lookup('ansible.builtin.template', 'ingress.yml.j2') | from_yaml }}" + definition: "{{ lookup('ansible.builtin.template', 'ingress.yaml.j2') | from_yaml }}" state: present namespace: "{{ argocd_namespace }}" register: apply_manifests @@ -53,7 +53,7 @@ - name: Apply ArgoCD repository kubernetes.core.k8s: - definition: "{{ lookup('ansible.builtin.template', 'repository.yml.j2') | from_yaml }}" + definition: "{{ lookup('ansible.builtin.template', 'repository.yaml.j2') | from_yaml }}" state: present namespace: "{{ argocd_namespace }}" register: apply_manifests @@ -63,7 +63,7 @@ - name: Apply ArgoCD Root Application kubernetes.core.k8s: - definition: "{{ lookup('ansible.builtin.template', 'root_application.yml.j2') | from_yaml }}" + definition: "{{ lookup('ansible.builtin.template', 'root_application.yaml.j2') | from_yaml }}" state: present namespace: "{{ argocd_namespace }}" register: apply_manifests diff --git a/roles/kubernetes_argocd/templates/repository.yml.j2 b/roles/kubernetes_argocd/templates/repository.yaml.j2 similarity index 100% rename from roles/kubernetes_argocd/templates/repository.yml.j2 rename to roles/kubernetes_argocd/templates/repository.yaml.j2 diff --git a/roles/kubernetes_argocd/templates/root_application.yml.j2 b/roles/kubernetes_argocd/templates/root_application.yaml.j2 similarity index 100% rename from roles/kubernetes_argocd/templates/root_application.yml.j2 rename to roles/kubernetes_argocd/templates/root_application.yaml.j2 diff --git a/roles/node_exporter/handlers/main.yml b/roles/node_exporter/handlers/main.yaml similarity index 100% rename from roles/node_exporter/handlers/main.yml rename to roles/node_exporter/handlers/main.yaml diff --git a/roles/node_exporter/tasks/get_version.yml b/roles/node_exporter/tasks/get_version.yaml similarity index 100% rename from roles/node_exporter/tasks/get_version.yml rename to roles/node_exporter/tasks/get_version.yaml diff --git a/roles/node_exporter/tasks/install.yml b/roles/node_exporter/tasks/install.yaml similarity index 100% rename from roles/node_exporter/tasks/install.yml rename to roles/node_exporter/tasks/install.yaml diff --git a/roles/node_exporter/tasks/main.yaml b/roles/node_exporter/tasks/main.yaml new file mode 100644 index 0000000..c24fec0 --- /dev/null +++ b/roles/node_exporter/tasks/main.yaml @@ -0,0 +1,6 @@ +- name: Get Version + ansible.builtin.include_tasks: get_version.yaml +- name: Install + ansible.builtin.include_tasks: install.yaml +- name: Setup Service + ansible.builtin.include_tasks: systemd.yaml diff --git a/roles/node_exporter/tasks/main.yml b/roles/node_exporter/tasks/main.yml deleted file mode 100644 index bc04101..0000000 --- a/roles/node_exporter/tasks/main.yml +++ /dev/null @@ -1,6 +0,0 @@ -- name: Get Version - ansible.builtin.include_tasks: get_version.yml -- name: Install - ansible.builtin.include_tasks: install.yml -- name: Setup Service - ansible.builtin.include_tasks: systemd.yml diff --git a/roles/node_exporter/tasks/systemd.yml b/roles/node_exporter/tasks/systemd.yaml similarity index 100% rename from roles/node_exporter/tasks/systemd.yml rename to roles/node_exporter/tasks/systemd.yaml diff --git a/roles/node_exporter/vars/main.yml b/roles/node_exporter/vars/main.yaml similarity index 100% rename from roles/node_exporter/vars/main.yml rename to roles/node_exporter/vars/main.yaml diff --git a/roles/proxmox/handlers/node.yml b/roles/proxmox/handlers/node.yaml similarity index 100% rename from roles/proxmox/handlers/node.yml rename to roles/proxmox/handlers/node.yaml diff --git a/roles/proxmox/tasks/00_setup_machines.yaml b/roles/proxmox/tasks/00_setup_machines.yaml new file mode 100644 index 0000000..c740bda --- /dev/null +++ b/roles/proxmox/tasks/00_setup_machines.yaml @@ -0,0 +1,8 @@ +--- +- name: Prepare Localhost + ansible.builtin.include_tasks: ./01_setup_localhost.yaml + when: is_localhost + +- name: Prepare Localhost + ansible.builtin.include_tasks: ./05_setup_node.yaml + when: is_proxmox_node diff --git a/roles/proxmox/tasks/00_setup_machines.yml b/roles/proxmox/tasks/00_setup_machines.yml deleted file mode 100644 index ec01b4e..0000000 --- a/roles/proxmox/tasks/00_setup_machines.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: Prepare Localhost - ansible.builtin.include_tasks: ./01_setup_localhost.yml - when: is_localhost - -- name: Prepare Localhost - ansible.builtin.include_tasks: ./05_setup_node.yml - when: is_proxmox_node diff --git a/roles/proxmox/tasks/01_setup_localhost.yml b/roles/proxmox/tasks/01_setup_localhost.yaml similarity index 100% rename from roles/proxmox/tasks/01_setup_localhost.yml rename to roles/proxmox/tasks/01_setup_localhost.yaml diff --git a/roles/proxmox/tasks/05_setup_node.yml b/roles/proxmox/tasks/05_setup_node.yaml similarity index 76% rename from roles/proxmox/tasks/05_setup_node.yml rename to roles/proxmox/tasks/05_setup_node.yaml index c3aa9c1..1c18463 100644 --- a/roles/proxmox/tasks/05_setup_node.yml +++ b/roles/proxmox/tasks/05_setup_node.yaml @@ -7,4 +7,4 @@ loop: "{{ proxmox_node_dependencies }}" - name: Ensure Harware Acceleration on node - ansible.builtin.include_tasks: 06_hardware_acceleration.yml + ansible.builtin.include_tasks: 06_hardware_acceleration.yaml diff --git a/roles/proxmox/tasks/06_hardware_acceleration.yml b/roles/proxmox/tasks/06_hardware_acceleration.yaml similarity index 100% rename from roles/proxmox/tasks/06_hardware_acceleration.yml rename to roles/proxmox/tasks/06_hardware_acceleration.yaml diff --git a/roles/proxmox/tasks/10_create_secrets.yml b/roles/proxmox/tasks/10_create_secrets.yaml similarity index 81% rename from roles/proxmox/tasks/10_create_secrets.yml rename to roles/proxmox/tasks/10_create_secrets.yaml index cbd983d..927b926 100644 --- a/roles/proxmox/tasks/10_create_secrets.yml +++ b/roles/proxmox/tasks/10_create_secrets.yaml @@ -6,7 +6,7 @@ mode: "0600" - name: Update Vault data - ansible.builtin.include_tasks: 15_create_secret.yml + ansible.builtin.include_tasks: 15_create_secret.yaml loop: "{{ vms | map(attribute='name') }}" loop_control: loop_var: "vm_name" diff --git a/roles/proxmox/tasks/15_create_secret.yml b/roles/proxmox/tasks/15_create_secret.yaml similarity index 100% rename from roles/proxmox/tasks/15_create_secret.yml rename to roles/proxmox/tasks/15_create_secret.yaml diff --git a/roles/proxmox/tasks/40_prepare_vm_creation.yml b/roles/proxmox/tasks/40_prepare_vm_creation.yaml similarity index 73% rename from roles/proxmox/tasks/40_prepare_vm_creation.yml rename to roles/proxmox/tasks/40_prepare_vm_creation.yaml index ea03d8f..65d7bca 100644 --- a/roles/proxmox/tasks/40_prepare_vm_creation.yml +++ b/roles/proxmox/tasks/40_prepare_vm_creation.yaml @@ -1,6 +1,6 @@ --- - name: Download Cloud Init Isos - ansible.builtin.include_tasks: 42_download_isos.yml + ansible.builtin.include_tasks: 42_download_isos.yaml loop: "{{ proxmox_cloud_init_images | dict2items | map(attribute='value') }}" loop_control: loop_var: distro diff --git a/roles/proxmox/tasks/42_download_isos.yml b/roles/proxmox/tasks/42_download_isos.yaml similarity index 100% rename from roles/proxmox/tasks/42_download_isos.yml rename to roles/proxmox/tasks/42_download_isos.yaml diff --git a/roles/proxmox/tasks/50_create_vms.yml b/roles/proxmox/tasks/50_create_vms.yaml similarity index 74% rename from roles/proxmox/tasks/50_create_vms.yml rename to roles/proxmox/tasks/50_create_vms.yaml index 96b5c34..947a04f 100644 --- a/roles/proxmox/tasks/50_create_vms.yml +++ b/roles/proxmox/tasks/50_create_vms.yaml @@ -5,13 +5,13 @@ name: vm_secrets # - name: Destroy vms (Only during rapid testing) -# ansible.builtin.include_tasks: 54_destroy_vm.yml +# ansible.builtin.include_tasks: 54_destroy_vm.yaml # loop: "{{ vms }}" # loop_control: # loop_var: "vm" - name: Create vms - ansible.builtin.include_tasks: 55_create_vm.yml + ansible.builtin.include_tasks: 55_create_vm.yaml loop: "{{ vms }}" loop_control: loop_var: "vm" diff --git a/roles/proxmox/tasks/54_destroy_vm.yml b/roles/proxmox/tasks/54_destroy_vm.yaml similarity index 100% rename from roles/proxmox/tasks/54_destroy_vm.yml rename to roles/proxmox/tasks/54_destroy_vm.yaml diff --git a/roles/proxmox/tasks/55_create_vm.yml b/roles/proxmox/tasks/55_create_vm.yaml similarity index 94% rename from roles/proxmox/tasks/55_create_vm.yml rename to roles/proxmox/tasks/55_create_vm.yaml index 732069f..0cfe636 100644 --- a/roles/proxmox/tasks/55_create_vm.yml +++ b/roles/proxmox/tasks/55_create_vm.yaml @@ -27,5 +27,5 @@ register: proxmox_deploy_info - name: Provision created VM - ansible.builtin.include_tasks: 56_provision_new_vm.yml + ansible.builtin.include_tasks: 56_provision_new_vm.yaml when: proxmox_deploy_info.changed diff --git a/roles/proxmox/tasks/56_provision_new_vm.yml b/roles/proxmox/tasks/56_provision_new_vm.yaml similarity index 98% rename from roles/proxmox/tasks/56_provision_new_vm.yml rename to roles/proxmox/tasks/56_provision_new_vm.yaml index 9131c7e..fb49c70 100644 --- a/roles/proxmox/tasks/56_provision_new_vm.yml +++ b/roles/proxmox/tasks/56_provision_new_vm.yaml @@ -35,7 +35,7 @@ state: started - name: Retry stopping VM - ansible.builtin.include_tasks: ./57_stop_and_verify_vm.yml + ansible.builtin.include_tasks: ./57_stop_and_verify_vm.yaml - name: Pause for 5 seconds for api ansible.builtin.pause: diff --git a/roles/proxmox/tasks/57_stop_and_verify_vm.yml b/roles/proxmox/tasks/57_stop_and_verify_vm.yaml similarity index 96% rename from roles/proxmox/tasks/57_stop_and_verify_vm.yml rename to roles/proxmox/tasks/57_stop_and_verify_vm.yaml index 96af549..ca59711 100644 --- a/roles/proxmox/tasks/57_stop_and_verify_vm.yml +++ b/roles/proxmox/tasks/57_stop_and_verify_vm.yaml @@ -36,4 +36,4 @@ seconds: 5 - name: "Failed to stop VM - Retrying..." - include_tasks: ./57_stop_and_verify_vm.yml + include_tasks: ./57_stop_and_verify_vm.yaml diff --git a/roles/proxmox/tasks/60_create_containers.yml b/roles/proxmox/tasks/60_create_containers.yaml similarity index 78% rename from roles/proxmox/tasks/60_create_containers.yml rename to roles/proxmox/tasks/60_create_containers.yaml index e1a29a0..16974ca 100644 --- a/roles/proxmox/tasks/60_create_containers.yml +++ b/roles/proxmox/tasks/60_create_containers.yaml @@ -5,7 +5,7 @@ name: vm_secrets - name: Create vms - ansible.builtin.include_tasks: 65_create_container.yml + ansible.builtin.include_tasks: 65_create_container.yaml loop: "{{ lxcs }}" loop_control: loop_var: "container" diff --git a/roles/proxmox/tasks/65_create_container.yml b/roles/proxmox/tasks/65_create_container.yaml similarity index 100% rename from roles/proxmox/tasks/65_create_container.yml rename to roles/proxmox/tasks/65_create_container.yaml diff --git a/roles/proxmox/tasks/main.yaml b/roles/proxmox/tasks/main.yaml new file mode 100644 index 0000000..1372419 --- /dev/null +++ b/roles/proxmox/tasks/main.yaml @@ -0,0 +1,19 @@ +--- +- name: Prepare Machines + ansible.builtin.include_tasks: 00_setup_machines.yaml + +- name: Create VM vault + ansible.builtin.include_tasks: 10_create_secrets.yaml + when: is_localhost + +- name: Prime node for VM + ansible.builtin.include_tasks: 40_prepare_vm_creation.yaml + when: is_proxmox_node + +- name: Create VMs + ansible.builtin.include_tasks: 50_create_vms.yaml + when: is_localhost + +- name: Create LXC containers + ansible.builtin.include_tasks: 60_create_containers.yaml + when: is_localhost diff --git a/roles/proxmox/tasks/main.yml b/roles/proxmox/tasks/main.yml deleted file mode 100644 index 3af6457..0000000 --- a/roles/proxmox/tasks/main.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -- name: Prepare Machines - ansible.builtin.include_tasks: 00_setup_machines.yml - -- name: Create VM vault - ansible.builtin.include_tasks: 10_create_secrets.yml - when: is_localhost - -- name: Prime node for VM - ansible.builtin.include_tasks: 40_prepare_vm_creation.yml - when: is_proxmox_node - -- name: Create VMs - ansible.builtin.include_tasks: 50_create_vms.yml - when: is_localhost - -- name: Create LXC containers - ansible.builtin.include_tasks: 60_create_containers.yml - when: is_localhost diff --git a/roles/proxmox/vars/main.yml b/roles/proxmox/vars/main.yaml similarity index 90% rename from roles/proxmox/vars/main.yml rename to roles/proxmox/vars/main.yaml index fb9022c..d406ef0 100644 --- a/roles/proxmox/vars/main.yml +++ b/roles/proxmox/vars/main.yaml @@ -3,7 +3,7 @@ proxmox_creator: ansible proxmox_storage: proxmox -proxmox_vault_file: ../vars/group_vars/proxmox/secrets_vm.yml +proxmox_vault_file: ../vars/group_vars/proxmox/secrets_vm.yaml proxmox_secrets_prefix: secrets_vm proxmox_cloud_init_images: debian: diff --git a/roles/reverse_proxy/defaults/main.yml b/roles/reverse_proxy/defaults/main.yaml similarity index 100% rename from roles/reverse_proxy/defaults/main.yml rename to roles/reverse_proxy/defaults/main.yaml diff --git a/roles/reverse_proxy/handlers/main.yml b/roles/reverse_proxy/handlers/main.yaml similarity index 100% rename from roles/reverse_proxy/handlers/main.yml rename to roles/reverse_proxy/handlers/main.yaml diff --git a/roles/reverse_proxy/tasks/00_go_install.yml b/roles/reverse_proxy/tasks/00_go_install.yaml similarity index 100% rename from roles/reverse_proxy/tasks/00_go_install.yml rename to roles/reverse_proxy/tasks/00_go_install.yaml diff --git a/roles/reverse_proxy/tasks/10_caddy_install.yml b/roles/reverse_proxy/tasks/10_caddy_install.yaml similarity index 100% rename from roles/reverse_proxy/tasks/10_caddy_install.yml rename to roles/reverse_proxy/tasks/10_caddy_install.yaml diff --git a/roles/reverse_proxy/tasks/20_xcaddy_install.yml b/roles/reverse_proxy/tasks/20_xcaddy_install.yaml similarity index 100% rename from roles/reverse_proxy/tasks/20_xcaddy_install.yml rename to roles/reverse_proxy/tasks/20_xcaddy_install.yaml diff --git a/roles/reverse_proxy/tasks/30_custom_caddy.yml b/roles/reverse_proxy/tasks/30_custom_caddy.yaml similarity index 100% rename from roles/reverse_proxy/tasks/30_custom_caddy.yml rename to roles/reverse_proxy/tasks/30_custom_caddy.yaml diff --git a/roles/reverse_proxy/tasks/50_netcup_dns.yml b/roles/reverse_proxy/tasks/50_netcup_dns.yaml similarity index 100% rename from roles/reverse_proxy/tasks/50_netcup_dns.yml rename to roles/reverse_proxy/tasks/50_netcup_dns.yaml diff --git a/roles/reverse_proxy/tasks/80_configure.yml b/roles/reverse_proxy/tasks/80_configure.yaml similarity index 100% rename from roles/reverse_proxy/tasks/80_configure.yml rename to roles/reverse_proxy/tasks/80_configure.yaml diff --git a/roles/reverse_proxy/tasks/main.yaml b/roles/reverse_proxy/tasks/main.yaml new file mode 100644 index 0000000..30c7db2 --- /dev/null +++ b/roles/reverse_proxy/tasks/main.yaml @@ -0,0 +1,18 @@ +--- +- name: Install Go for Caddy + ansible.builtin.include_tasks: 00_go_install.yaml + +- name: Install Caddy + ansible.builtin.include_tasks: 10_caddy_install.yaml + +- name: Install xCaddy + ansible.builtin.include_tasks: 20_xcaddy_install.yaml + +- name: Setup Custom Caddy + ansible.builtin.include_tasks: 30_custom_caddy.yaml + +- name: Setup Netcup DNS + ansible.builtin.include_tasks: 50_netcup_dns.yaml + +- name: Configure Caddy + ansible.builtin.include_tasks: 80_configure.yaml diff --git a/roles/reverse_proxy/tasks/main.yml b/roles/reverse_proxy/tasks/main.yml deleted file mode 100644 index 2b604a3..0000000 --- a/roles/reverse_proxy/tasks/main.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -- name: Install Go for Caddy - ansible.builtin.include_tasks: 00_go_install.yml - -- name: Install Caddy - ansible.builtin.include_tasks: 10_caddy_install.yml - -- name: Install xCaddy - ansible.builtin.include_tasks: 20_xcaddy_install.yml - -- name: Setup Custom Caddy - ansible.builtin.include_tasks: 30_custom_caddy.yml - -- name: Setup Netcup DNS - ansible.builtin.include_tasks: 50_netcup_dns.yml - -- name: Configure Caddy - ansible.builtin.include_tasks: 80_configure.yml diff --git a/roles/reverse_proxy/vars/main.yml b/roles/reverse_proxy/vars/main.yaml similarity index 100% rename from roles/reverse_proxy/vars/main.yml rename to roles/reverse_proxy/vars/main.yaml diff --git a/vars/group_vars/all/secrets.yml b/vars/group_vars/all/secrets.yaml similarity index 100% rename from vars/group_vars/all/secrets.yml rename to vars/group_vars/all/secrets.yaml diff --git a/vars/group_vars/all/vars.yml b/vars/group_vars/all/vars.yaml similarity index 100% rename from vars/group_vars/all/vars.yml rename to vars/group_vars/all/vars.yaml diff --git a/vars/group_vars/docker/docker.yml b/vars/group_vars/docker/docker.yaml similarity index 100% rename from vars/group_vars/docker/docker.yml rename to vars/group_vars/docker/docker.yaml diff --git a/vars/group_vars/docker/keycloak.yml b/vars/group_vars/docker/keycloak.yaml similarity index 100% rename from vars/group_vars/docker/keycloak.yml rename to vars/group_vars/docker/keycloak.yaml diff --git a/vars/group_vars/docker/port_mapping.yml b/vars/group_vars/docker/port_mapping.yaml similarity index 100% rename from vars/group_vars/docker/port_mapping.yml rename to vars/group_vars/docker/port_mapping.yaml diff --git a/vars/group_vars/docker/secrets.yml b/vars/group_vars/docker/secrets.yaml similarity index 100% rename from vars/group_vars/docker/secrets.yml rename to vars/group_vars/docker/secrets.yaml diff --git a/vars/group_vars/docker/vars.yml b/vars/group_vars/docker/vars.yaml similarity index 100% rename from vars/group_vars/docker/vars.yml rename to vars/group_vars/docker/vars.yaml diff --git a/vars/group_vars/k3s/secrets.yml b/vars/group_vars/k3s/secrets.yaml similarity index 100% rename from vars/group_vars/k3s/secrets.yml rename to vars/group_vars/k3s/secrets.yaml diff --git a/vars/group_vars/k3s/secrets_token.yml b/vars/group_vars/k3s/secrets_token.yaml similarity index 100% rename from vars/group_vars/k3s/secrets_token.yml rename to vars/group_vars/k3s/secrets_token.yaml diff --git a/vars/group_vars/k3s/vars.yml b/vars/group_vars/k3s/vars.yaml similarity index 100% rename from vars/group_vars/k3s/vars.yml rename to vars/group_vars/k3s/vars.yaml diff --git a/vars/group_vars/kubernetes/secrets.yml b/vars/group_vars/kubernetes/secrets.yaml similarity index 100% rename from vars/group_vars/kubernetes/secrets.yml rename to vars/group_vars/kubernetes/secrets.yaml diff --git a/vars/group_vars/kubernetes/services.yml b/vars/group_vars/kubernetes/services.yaml similarity index 100% rename from vars/group_vars/kubernetes/services.yml rename to vars/group_vars/kubernetes/services.yaml diff --git a/vars/group_vars/kubernetes/vars.yml b/vars/group_vars/kubernetes/vars.yaml similarity index 100% rename from vars/group_vars/kubernetes/vars.yml rename to vars/group_vars/kubernetes/vars.yaml diff --git a/vars/group_vars/proxmox/containers.yml b/vars/group_vars/proxmox/containers.yaml similarity index 100% rename from vars/group_vars/proxmox/containers.yml rename to vars/group_vars/proxmox/containers.yaml diff --git a/vars/group_vars/proxmox/secrets.yml b/vars/group_vars/proxmox/secrets.yaml similarity index 100% rename from vars/group_vars/proxmox/secrets.yml rename to vars/group_vars/proxmox/secrets.yaml diff --git a/vars/group_vars/proxmox/secrets_vm.yml b/vars/group_vars/proxmox/secrets_vm.yaml similarity index 100% rename from vars/group_vars/proxmox/secrets_vm.yml rename to vars/group_vars/proxmox/secrets_vm.yaml diff --git a/vars/group_vars/proxmox/vars.yml b/vars/group_vars/proxmox/vars.yaml similarity index 100% rename from vars/group_vars/proxmox/vars.yml rename to vars/group_vars/proxmox/vars.yaml diff --git a/vars/group_vars/proxmox/vms.yml b/vars/group_vars/proxmox/vms.yaml similarity index 100% rename from vars/group_vars/proxmox/vms.yml rename to vars/group_vars/proxmox/vms.yaml