Make bind/designate usable via wireguard

berendt · berendt · commit d7165357604d · 2025-01-12T19:44:48.000+01:00
Signed-off-by: Christian Berendt &lt;berendt@osism.tech&gt;
diff --git a/environments/infrastructure/configuration.yml b/environments/infrastructure/configuration.yml
@@ -74,6 +74,7 @@ wireguard_users:
     key: LDweUZxqy/0AieSVw3baZmbRMPBqhfDUcuLAwSYyQkE=
     ip: 192.168.48.4
 wireguard_create_client_config: true
+wireguard_dns: 192.168.16.10
 
 ##########################
 # nexus
diff --git a/environments/kolla/configuration.yml b/environments/kolla/configuration.yml
@@ -57,6 +57,8 @@ octavia_network_type: tenant
 
 # designate
 designate_ns_record: openstack.testbed.osism.xyz
+designate_forwarders_addresses: ""
+designate_recursion: "yes"
 
 # horizon
 horizon_keystone_multidomain: true
diff --git a/scripts/deploy-in-a-nutshell.sh b/scripts/deploy-in-a-nutshell.sh
@@ -7,6 +7,9 @@ sh -c '/opt/configuration/scripts/pull-images.sh'
 # prepare the ceph deployment
 sh -c '/opt/configuration/scripts/prepare-ceph-configuration.sh'
 
+# prepare the openstack deployment
+sh -c '/opt/configuration/scripts/prepare-openstack-configuration.sh'
+
 # deploy everything
 
 echo
diff --git a/scripts/deploy/300-openstack-services.sh b/scripts/deploy/300-openstack-services.sh
@@ -4,6 +4,8 @@ set -e
 source /opt/configuration/scripts/include.sh
 source /opt/configuration/scripts/manager-version.sh
 
+sh -c '/opt/configuration/scripts/prepare-openstack-configuration.sh'
+
 # checkout the cinder dm-clone driver and prepare drives
 osism apply -e custom cinder-driver-dm-clone
 
diff --git a/scripts/include.sh b/scripts/include.sh
@@ -14,3 +14,7 @@ wait_for_container_healthy() {
         fi
     done
 }
+
+get_default_dns_servers() {
+    resolvectl dns | grep Global | awk -F': ' '{ print $2 }' | sed 's/ /; /g'
+}
diff --git a/scripts/prepare-openstack-configuration.sh b/scripts/prepare-openstack-configuration.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -e
+
+source /opt/configuration/scripts/include.sh
+source /opt/configuration/scripts/manager-version.sh
+
+default_dns_servers="$(get_default_dns_servers)"
+sed -i "s/designate_forwarders_addresses: .*/designate_forwarders_addresses: \"$default_dns_servers\"/" /opt/configuration/environments/kolla/configuration.yml

Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,7 @@ wait_for_container_healthy() {`
`14`	`14`	`fi`
`15`	`15`	`done`
`16`	`16`	`}`
	`17`	`+`
	`18`	`+get_default_dns_servers() {`
	`19`	`+ resolvectl dns \| grep Global \| awk -F': ' '{ print $2 }' \| sed 's/ /; /g'`
	`20`	`+}`