*** Wartungsfenster jeden ersten Mittwoch vormittag im Monat ***

Skip to content
Snippets Groups Projects
Commit 7b275d52 authored by Mc Cartney, Adam Charles's avatar Mc Cartney, Adam Charles
Browse files

Merge branch 'main' into 'rocky/main'

# Conflicts:
#   README.md
#   roles/create_infrastructure/defaults/main.yml
#   roles/create_infrastructure/tasks/inventory.yml
#   roles/create_infrastructure/tasks/keypair.yml
#   roles/create_infrastructure/tasks/lb_members.yml
#   roles/create_infrastructure/tasks/loadbalancer.yml
#   roles/create_infrastructure/tasks/main.yml
#   roles/create_infrastructure/tasks/network.yml
#   roles/create_infrastructure/tasks/security_groups.yml
#   roles/create_infrastructure/tasks/vm.yml
#   roles/create_infrastructure/templates/hosts.j2
#   roles/rke2/defaults/main.yml
#   roles/rke2/handlers/main.yml
#   roles/rke2/tasks/config_rke2.yml
#   roles/rke2/tasks/install_rke2.yml
#   roles/rke2/tasks/main.yml
#   roles/rke2/tasks/setup_host.yml
#   roles/rke2/templates/config.yaml.j2
#   roles/rke2/templates/kernel_params.conf.j2
parents e15b0b86 cba80b4a
Branches rocky/main
No related tags found
1 merge request!1Restore main as the default branch
Showing
with 287 additions and 21 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment