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

Set default DNS domain for gateway #20

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Set default DNS domain for gateway #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 metadata/service/gateway/single.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ parameters:
neutron:
gateway:
enabled: true
dns_domain: novalocal
Copy link
Member

Choose a reason for hiding this comment

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

remove this line

Copy link
Author

Choose a reason for hiding this comment

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

This is the fix to the bug I reported though. Removing this line the bug would still exist in default deployments

If you want to remove the default here, then you probably should also remove the default in nova
https://github.com/salt-formulas/salt-formula-nova/blob/master/metadata/service/control/single.yml#L16 ,
https://github.com/salt-formulas/salt-formula-nova/blob/master/metadata/service/control/container.yml#L18 ,
and
https://github.com/salt-formulas/salt-formula-nova/blob/master/metadata/service/control/cluster.yml#L16

Would you rather fix the defaults in that package?

Copy link
Author

Choose a reason for hiding this comment

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

Also in this package:
https://github.com/salt-formulas/salt-formula-neutron/blob/master/metadata/service/control/single.yml#L13
https://github.com/salt-formulas/salt-formula-neutron/blob/master/metadata/service/control/container.yml#L14
https://github.com/salt-formulas/salt-formula-neutron/blob/master/metadata/service/control/cluster.yml#L11

Would you like me to remove those defaults as well to make it consistent?

version: ${_param:neutron_version}
message_queue:
engine: rabbitmq
Expand Down
3 changes: 3 additions & 0 deletions neutron/files/mitaka/neutron-generic.conf.Debian
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ dhcp_lease_duration = 600

# Domain to use for building the hostnames (string value)
#dns_domain = openstacklocal
{% if neutron.get('dns_domain', False) %}
dns_domain = {{ neutron.dns_domain }}
{% endif %}

# Driver for external DNS integration. (string value)
#external_dns_driver = <None>
Expand Down
3 changes: 3 additions & 0 deletions neutron/files/ocata/neutron-generic.conf.Debian
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ dhcp_lease_duration = 600

# Domain to use for building the hostnames (string value)
#dns_domain = openstacklocal
{% if neutron.get('dns_domain', False) %}
dns_domain = {{ neutron.dns_domain }}
{% endif %}

# Driver for external DNS integration. (string value)
#external_dns_driver = <None>
Expand Down