Add DNS or GW for use by dnsmasq #389
Conversation
metal3-io-bot
added
the
size/S
There was a problem hiding this comment.
thanks, this is ok, I think we should also document the variables in https://github.com/metal3-io/metal3-docs/blob/main/docs/user-guide/src/ironic/ironic_variables.md
ironic-config/dnsmasq.conf.j2
Outdated
| @@ -12,8 +12,19 @@ log-dhcp | |||
| dhcp-range={{ env.DHCP_RANGE }} | |||
|
|
|||
| # Disable default router(s) and DNS over provisioning network | |||
| # It can be used when setting DNS or GW variables. | |||
| {%- if env["GW_IP"] is undefined %} | |||
There was a problem hiding this comment.
Please don't shorten words: GATEWAY_IP
ironic-config/dnsmasq.conf.j2
Outdated
| @@ -12,8 +12,19 @@ log-dhcp | |||
| dhcp-range={{ env.DHCP_RANGE }} | |||
|
|
|||
| # Disable default router(s) and DNS over provisioning network | |||
There was a problem hiding this comment.
... or even removed completely since you have another comment just below
There was a problem hiding this comment.
remove that comment.
|
In addition to the user guide, let's also update the README in this repo? |
|
I'd be also interested in being able to use |
|
Something like diff --git a/scripts/rundnsmasq b/scripts/rundnsmasq
index 7a4fa45..09ce32b 100755
--- a/scripts/rundnsmasq
+++ b/scripts/rundnsmasq
@@ -8,6 +8,10 @@ export DNS_PORT=${DNS_PORT:-0}
wait_for_interface_or_ip
+if [[ "${DNS_IP:-}" == "provisioning" ]]; then
+ export DNS_IP=$IRONIC_IP
+fi
+
mkdir -p /shared/tftpboot
mkdir -p /shared/tftpboot/arm64-efi
mkdir -p /shared/html/images |
metal3-io-bot
added
size/M
| if [[ "${DNS_IP:-}" == "provisioning" ]]; then | ||
| export DNS_IP=$IRONIC_IP | ||
| fi | ||
|
|
There was a problem hiding this comment.
@dtantsur
added it, but I don't know if it can act as an 'ironic' dns.
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dtantsur The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
metal3-io-bot
added
the
approved
|
/test-ubuntu-integration-main I have a feeling that the CI is broken |
|
@dtantsur |
|
/test-ubuntu-integration-main |
|
/test-ubuntu-integration-main No, it's an upstream Ironic breakage. A fix has been merged, we need to wait until it gets into repositories. |
|
/test-ubuntu-integration-main The last attempt before I merge a CI workaround. |
|
@dtantsur |
|
/test-centos-integration-main |
|
/lgtm |
OCPBUGS-17472: Expand regex for fcos/okd packages list
Depending on your environment, you should be able to use either GW or DNS.