Commit 4c3b4d57 authored by Mike Hibler's avatar Mike Hibler

Plumb through MANAGEMENT_{NETWORK,NETMASK,ROUTER} to the defs file.

In APT, the management network is not the same as was defined in
dhcpd_makeconf. The values that were hardwired there are now the
defaults.
parent e1035371
......@@ -728,6 +728,9 @@ DHCPD_EXTRAIFS
DHCPD_DYNRANGE
VIRTNODE_NETMASK
VIRTNODE_NETWORK
MANAGEMENT_ROUTER
MANAGEMENT_NETMASK
MANAGEMENT_NETWORK
PUBLIC_NETMASK
PUBLIC_ROUTER
PUBLIC_NETWORK
......@@ -4939,6 +4942,9 @@ done
......@@ -5080,6 +5086,9 @@ EC2META_ENABLE=0
BROWSER_CONSOLE_ENABLE=0
IPV6_ENABLED=0
IPV6_SUBNET_PREFIX=""
MANAGEMENT_NETWORK="10.249.249.0"
MANAGEMENT_NETMASK="255.255.255.0"
MANAGEMENT_ROUTER="10.249.249.253"
#
# XXX You really don't want to change these!
......@@ -5357,6 +5366,19 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
cat >>confdefs.h <<_ACEOF
#define MANAGEMENT_NETWORK "$MANAGEMENT_NETWORK"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define MANAGEMENT_NETMASK "$MANAGEMENT_NETMASK"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define MANAGEMENT_ROUTER "$MANAGEMENT_ROUTER"
_ACEOF
if test $OPSDBSUPPORT -eq 1; then
cat >>confdefs.h <<_ACEOF
#define OPSDBSUPPORT 1
......
......@@ -215,6 +215,9 @@ AC_SUBST(PRIVATE_NETMASK)
AC_SUBST(PUBLIC_NETWORK)
AC_SUBST(PUBLIC_ROUTER)
AC_SUBST(PUBLIC_NETMASK)
AC_SUBST(MANAGEMENT_NETWORK)
AC_SUBST(MANAGEMENT_NETMASK)
AC_SUBST(MANAGEMENT_ROUTER)
AC_SUBST(VIRTNODE_NETWORK)
AC_SUBST(VIRTNODE_NETMASK)
AC_SUBST(DHCPD_DYNRANGE)
......@@ -425,6 +428,9 @@ EC2META_ENABLE=0
BROWSER_CONSOLE_ENABLE=0
IPV6_ENABLED=0
IPV6_SUBNET_PREFIX=""
MANAGEMENT_NETWORK="10.249.249.0"
MANAGEMENT_NETMASK="255.255.255.0"
MANAGEMENT_ROUTER="10.249.249.253"
#
# XXX You really don't want to change these!
......@@ -575,6 +581,10 @@ AC_DEFINE_UNQUOTED(EXTERNAL_NTPSERVER3, "$EXTERNAL_NTPSERVER3")
AC_DEFINE_UNQUOTED(EXTERNAL_NTPSERVER4, "$EXTERNAL_NTPSERVER4")
AC_DEFINE_UNQUOTED(NTPDRIFTFILE, "$NTPDRIFTFILE")
AC_DEFINE_UNQUOTED(MANAGEMENT_NETWORK, "$MANAGEMENT_NETWORK")
AC_DEFINE_UNQUOTED(MANAGEMENT_NETMASK, "$MANAGEMENT_NETMASK")
AC_DEFINE_UNQUOTED(MANAGEMENT_ROUTER, "$MANAGEMENT_ROUTER")
if test $OPSDBSUPPORT -eq 1; then
AC_DEFINE_UNQUOTED(OPSDBSUPPORT, 1)
fi
......
......@@ -54,6 +54,9 @@ my $TBOPS = "@TBOPSEMAIL@";
my $ELABINELAB = @ELABINELAB@;
my $BOSSNODE_IP = "@BOSSNODE_IP@";
my $OURDOMAIN = "@OURDOMAIN@";
my $MANAGEMENT_NETWORK = "@MANAGEMENT_NETWORK@";
my $MANAGEMENT_NETMASK = "@MANAGEMENT_NETMASK@";
my $MANAGEMENT_GATEWAY = "@MANAGEMENT_ROUTER@";
# un-taint path
$ENV{'PATH'} = '/bin:/usr/bin:/usr/sbin:/usr/local/bin';
......@@ -94,9 +97,6 @@ my $outfile = "/tmp/dhcpd_makeconf.$$";
my $OUT = *STDOUT;
my %subboss_dhcp_servers;
my %management_ifaces;
my $MANAGEMENT_NETWORK = "10.249.249.0";
my $MANAGEMENT_NETMASK = "255.255.255.0";
my $MANAGEMENT_GATEWAY = "10.249.249.253";
my $m_network = inet_ntoa(inet_aton($MANAGEMENT_NETWORK) &
inet_aton($MANAGEMENT_NETMASK));
......
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