Merge branch 'main' into version/grafana

Author: sjpb

openstack.pkr.hcl

@@ -6,7 +6,7 @@ locals {timestamp = formatdate("YYMMDD-hhmm", timestamp())}
 
 variable "source_image_name" {
   type = string
-  default = "Rocky-8-GenericCloud-8.5-20211114.2.x86_64"
+  default = "Rocky-8-GenericCloud-8.6.20220702.0.x86_64.qcow2"
 }
 
 variable "ssh_bastion_host" {

roles/builder/tasks/main.yml

@@ -30,4 +30,12 @@
 - import_tasks: prometheus.yml
 - import_tasks: nodeexporter.yml
 - import_tasks: grafana.yml
+
+- name: Delete /etc/resolv.conf
+  # required as if cloud-init (rather than network manager) controls this on next boot it won't be entirely overrwritten
+  file:
+    path: /etc/resolv.conf
+    state: absent
+  become: yes
+
 # - meta: end_here # useful for debugging, can rerun