diff --git a/inventory/inventory.ini b/inventory/inventory.ini index dc7ecc0..7e88f49 100644 --- a/inventory/inventory.ini +++ b/inventory/inventory.ini @@ -1,28 +1,12 @@ -[amazon] -aws ansible_user=ubuntu - -[digitalocean] +t440 +baxter +pve0 ansible_user=root +rhel0 +docker0 doc ansible_user=pollen - -[cloud:children] -amazon -digitalocean - -[k8s] node0 node1 node2 node3 node4 node5 - -[r730xd:children] -k8s -rhel0 -docker0 - -t440 -baxter - -[onprem:children] -r730xd0 diff --git a/manifests/external-dns/install.yaml b/manifests/external-dns/install.yaml index 78bb619..e7d4911 100644 --- a/manifests/external-dns/install.yaml +++ b/manifests/external-dns/install.yaml @@ -116,6 +116,6 @@ spec: - --pihole-api-version=6 # Change this to the actual address of your Pi-hole web server #- --pihole-server=http://pihole-web.default.svc.cluster.local - - --pihole-server=http://192.168.0.238 + - --pihole-server=http://192.168.0.203 securityContext: fsGroup: 65534 # For ExternalDNS to be able to read Kubernetes token files diff --git a/manifests/metallb/resources.yaml b/manifests/metallb/resources.yaml index d9126dc..9a25d00 100644 --- a/manifests/metallb/resources.yaml +++ b/manifests/metallb/resources.yaml @@ -6,7 +6,8 @@ metadata: namespace: metallb-system spec: addresses: - - 192.168.0.230-192.168.0.253 + - 192.168.0.201-192.168.0.229 #k3s-seed + #- 192.168.0.230-192.168.0.253 main --- apiVersion: metallb.io/v1beta1 kind: L2Advertisement diff --git a/manifests/pihole/values.yaml b/manifests/pihole/values.yaml index f6f95a2..060d735 100644 --- a/manifests/pihole/values.yaml +++ b/manifests/pihole/values.yaml @@ -50,7 +50,7 @@ serviceDns: externalTrafficPolicy: Local # -- A fixed `spec.loadBalancerIP` for the DNS Service - loadBalancerIP: "192.168.0.234" + loadBalancerIP: "" # -- A fixed `spec.loadBalancerIP` for the IPv6 DNS Service loadBalancerIPv6: "" # -- `spec.loadBalancerClass` for the DNS Service. Only used if type is LoadBalancer. @@ -128,7 +128,7 @@ serviceWeb: externalTrafficPolicy: Local # -- A fixed `spec.loadBalancerIP` for the web interface Service - loadBalancerIP: "192.168.0.239" + loadBalancerIP: "" # -- A fixed `spec.loadBalancerIP` for the IPv6 web interface Service loadBalancerIPv6: "" # -- `spec.loadBalancerClass` for the web interface Service. Only used if type is LoadBalancer. diff --git a/playbooks/common/update_upgrade.yml b/playbooks/common/update_upgrade.yml index 6421535..65359b6 100644 --- a/playbooks/common/update_upgrade.yml +++ b/playbooks/common/update_upgrade.yml @@ -1,20 +1,19 @@ --- -- name: Updates all managed servers - hosts: servers +- name: Updates all managed servers including localhost + hosts: all become: true - vars: - group_vars: groups_vars/servers.yml tasks: - #- name: update package index on all machines - #ansible.builtin.apt: - #update_cache: yes - #when: ansible_os_family == "Debian" + - name: Upgrade all packages to latest version + ansible.builtin.dnf: + name: "*" + state: latest + when: ansible_os_family == "RedHat" + - name: Upgrade all packages to latest version ansible.builtin.apt: name: "*" state: latest - notify: reboot when: ansible_os_family == "Debian" @@ -23,37 +22,6 @@ ansible.builtin.reboot: test_command: whoami -- name: this updates the control node - hosts: localhost - become: true - tasks: - - name: update package index on local machine - ansible.builtin.apt: - update_cache: true - - - name: update all packages to latest version - ansible.builtin.apt: - name: "*" - state: latest - -#- name: Upgrade pihole on dns using docker compose - #hosts: pihole - #tasks: - #- name: pull new images via docker compose - #command: - #cmd: docker compose -f pihole_compose.yml pull - #chdir: /home/pollen/pihole - - #- name: remove the currently running container - #command: - #cmd: docker compose -f pihole_compose.yml down - #chdir: /home/pollen/pihole - - #- name: bring back pihole container - #command: - #cmd: docker compose -f pihole_compose.yml up -d - #chdir: /home/pollen/pihole - # work in progress for windows host # - name: Upgrade software on windows hosts #hosts: bane