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.

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

Conversation

tgerdes
Copy link

@tgerdes tgerdes commented Jul 27, 2017

Make the gateway consistent with the controller.
Addresses #19

@@ -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') %}
Copy link
Member

@epcim epcim Sep 19, 2017

Choose a reason for hiding this comment

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

provide default False
why it's this neutron.dns_domain and not neutron.gateway.dns_domain
also update mitaka conf if relevant.

Copy link
Author

Choose a reason for hiding this comment

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

Done. Pushing a update shortly.

Copy link
Author

Choose a reason for hiding this comment

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

It is neutron.dns_domain because neutron is neutron.gateway from the map.jinja in the context of this template: https://github.com/salt-formulas/salt-formula-neutron/blob/master/neutron/files/ocata/neutron-generic.conf.Debian#L2

@@ -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.

Make the gateway consistent with the controller.
Addresses Issue salt-formulas#19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants