Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ATMOSPHERE-606] replace value of dnsmasq_dns_servers to 1.1.1.1 #2184

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[ATMOSPHERE-606] replace value of dnsmasq_dns_servers to 1.1.1.1 #2184

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97e6189
replace value of dnsmasq_dns_servers to 1.1.1.1
adrianreza Dec 6, 2024
b12b7aa
add dnsmasq_dns_server to OVN part and add neutron_default_dns_server…
adrianreza Dec 9, 2024
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
5 changes: 5 additions & 0 deletions roles/neutron/vars/main.yml
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can simply add this:

dnsmasq_dns_servers: "{{ neutron_coredns_cluster_ip | default('1.1.1.1') }}"

Into the OVN section, since that gets merged into the OVN part.

Also, perhaps I think we should add a variable called neutron_default_dns_servers which gets set to 10.96.0.20 if its not using ovn, and by default, do not set it, so the user has to set it if its using ovn.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added dnsmasq_dns_servers to OVN part. And for neutron_default_dns_servers I put it on neutron conf for ML2/OVS part. I'm not sure if it was correct or not. Need your feedback @mnaser

Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ __neutron_helm_values:
driver: noop
service_providers:
service_provider: VPN:strongswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default
neutron_default_dns_servers: 10.96.0.20
dhcp_agent:
DEFAULT:
dnsmasq_dns_servers: "{{ neutron_coredns_cluster_ip | default('10.96.0.20') }}"
Expand Down Expand Up @@ -93,6 +94,10 @@ __neutron_ovn_helm_values:
ovn_emit_need_to_frag: true
service_providers:
service_provider: VPN:strongswan:neutron_vpnaas.services.vpn.service_drivers.ovn_ipsec.IPsecOvnVPNDriver:default
dhcp_agent:
DEFAULT:
dnsmasq_dns_servers: "{{ neutron_coredns_cluster_ip | default('1.1.1.1') }}"
enable_isolated_metadata: true
ovn_metadata_agent:
DEFAULT:
metadata_proxy_shared_secret: "{{ openstack_helm_endpoints['compute_metadata']['secret'] }}"
Expand Down
Loading