Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions environments/infrastructure/configuration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions environments/kolla/configuration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions scripts/deploy-in-a-nutshell.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions scripts/deploy/300-openstack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 4 additions & 0 deletions scripts/include.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
8 changes: 8 additions & 0 deletions scripts/prepare-openstack-configuration.sh
Original file line number Diff line number Diff line change
@@ -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