Commit e9a187a1 authored by Nikos Skalkotos's avatar Nikos Skalkotos
Browse files

Add new {DHCP,DHCP6}_TAGS configuration parameters

Those parameters will host lists of ganeti network tags that will allow
snf-image to determine which VM NICs it should configure to perform
dhcp.
parent 9f03775c
......@@ -443,6 +443,9 @@ fi
: ${XEN_SCRIPTS_DIR="@sysconfdir@/xen/scripts"}
: ${MULTISTRAP_CONFIG:="@MULTISTRAP_CONFIG@"}
: ${MULTISTRAP_APTPREFDIR:="@MULTISTRAP_APTPREFDIR@"}
: ${DHCP_TAGS:="auto dhcp nfdhcpd"}
: ${STATEFUL_DHCPV6_TAGS:="dhcpv6 stateful_dhcpv6"}
: ${STATELESS_DHCPV6_TAGS:="nfdhcpd stateless_dhcpv6"}
SCRIPT_NAME=$(basename $0)
......
......@@ -187,6 +187,9 @@ add_cleanup rm "$floppy"
snf_export_TYPE="$IMG_FORMAT"
snf_export_HOSTNAME="$instance"
snf_export_DHCP_TAGS="$DHCP_TAGS"
snf_export_STATEFUL_DHCPV6_TAGS="$STATEFUL_DHCPV6_TAGS"
snf_export_STATELESS_DHCPV6_TAGS="$STATELESS_DHCPV6_TAGS"
if [ -n "${IMG_PASSWD+dummy}" ]; then
snf_export_PASSWD="$IMG_PASSWD"
......
......@@ -77,6 +77,23 @@
# input of this program.
# PROGRESS_MONITOR="@PROGRESS_MONITOR@"
# DHCP_TAGS: Space separated list of ganeti network tags. snf-image will
# configure a VM's NIC to use DHCP if the card is expected to have an IPv4
# address and any of those tags is present in the card's NETWORK_TAGS variable.
# DHCP_TAGS="auto dhcp nfdhcpd"
# STATEFUL_DHCPV6_TAGS: Space separated list of ganeti network tags. snf-image
# will configure a VM's NIC to use DHCPv6 if the card is expected to have an
# IPv6 address and any of those tags is present in the card's NETWORK_TAGS
# variable.
# STATEFUL_DHCPV6_TAGS="dhcpv6 stateful_dhcpv6"
# STATELESS_DHCPV6_TAGS: Space separated list of ganeti network tags. snf-image
# will configure a VM's NIC to perform SLAAC and Stateless DHCPv6 if the card
# is expected to have an IPv6 address and any of those tags is present in the
# card's NETWORK_TAGS variable.
# STATELESS_DHCPV6_TAGS="nfdhcpd stateless_dhcpv6"
# UNATTEND: This variable overwrites the unattend.xml file used when deploying
# a Windows image. snf-image-helper will use its own unattend.xml file if this
# variable is empty. Please leave this empty, unless you really know what you
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment