Configure dhcp_gateway from /etc/astute.yaml

When slaves are provisioned using external repository, it can be
more suitable to use the separate gateway to access the repository
instead of Fuel admin note.

Also "supersede routers 0;" removed from /etc/dhcp/dhclient.conf

Change-Id: I3757f6751f649595ed793bc9804904ef03b55d53
Related to blueprint consume-external-ubuntu

deployment/puppet/cobbler/templates/preseed/ubuntu-1204.preseed.erb

@@ -149,7 +149,6 @@ $SNIPPET('ubuntu_packages_late')
 $SNIPPET('ubuntu_partition_late')
 $SNIPPET('ubuntu_disable_pxe') && \
 $SNIPPET('ubuntu_network') && \
-echo 'supersede routers 0;' > /target/etc/dhcp/dhclient.conf && \
 $SNIPPET('cinder_create_lvm_group__ubuntu') && \
 $SNIPPET('ubuntu_puppet_config') && \
 $SNIPPET('ubuntu_mcollective_config') && \

deployment/puppet/cobbler/templates/preseed/ubuntu-1404.preseed.erb

@@ -153,7 +153,6 @@ $SNIPPET('ubuntu_precise_packages_late')
 $SNIPPET('ubuntu_partition_late')
 $SNIPPET('ubuntu_disable_pxe') && \
 $SNIPPET('ubuntu_network') && \
-echo 'supersede routers 0;' > /target/etc/dhcp/dhclient.conf && \
 $SNIPPET('cinder_create_lvm_group__ubuntu') && \
 $SNIPPET('ubuntu_puppet_config') && \
 $SNIPPET('ubuntu_mcollective_config') && \

deployment/puppet/cobbler/templates/snippets/dhclient_ignore_routers_opt.erb

@@ -1,6 +1,5 @@
 # Force dhclient to ingnore 'routers' option on all interfaces.
 mkdir -p /etc/dhcp
-echo "supersede routers 0;" > /etc/dhcp/dhclient.conf
 if (grep -q "^\s*DHCLIENTARGS" /etc/sysconfig/network); then
     sed -i 's#^\s*DHCLIENTARGS.*#DHCLIENTARGS="-cf /etc/dhcp/dhclient.conf"#' /etc/sysconfig/network
 else

deployment/puppet/nailgun/examples/cobbler-only.pp

@@ -44,6 +44,13 @@ node default {
   $dhcp_end_address   = $::fuel_settings['ADMIN_NETWORK']['dhcp_pool_end']
   $dhcp_netmask       = $::fuel_settings['ADMIN_NETWORK']['netmask']
 
+  $dhcp_gw            = $::fuel_settings['ADMIN_NETWORK']['dhcp_gateway']
+  if $dhcp_gw {
+    $dhcp_gateway = $dhcp_gw
+  } else {
+    $dhcp_gateway = $cobbler_host
+  }
+
   $puppet_master_hostname = "${hostname}.${domain}"
 
   $mco_pskey = "unset"
@@ -82,7 +89,7 @@ node default {
     dhcp_start_address => $dhcp_start_address,
     dhcp_end_address   => $dhcp_end_address,
     dhcp_netmask       => $dhcp_netmask,
-    dhcp_gateway       => $cobbler_host,
+    dhcp_gateway       => $dhcp_gateway,
     dhcp_interface     => $dhcp_interface,
     nailgun_api_url    => $nailgun_api_url,
   }

deployment/puppet/nailgun/examples/nailgun-only.pp

@@ -102,6 +102,7 @@ class { "nailgun::venv":
   admin_network_netmask => $::fuel_settings['ADMIN_NETWORK']['netmask'],
   admin_network_mac     => $::fuel_settings['ADMIN_NETWORK']['mac'],
   admin_network_ip      => $::fuel_settings['ADMIN_NETWORK']['ipaddress'],
+  admin_network_gateway => $::fuel_settings['ADMIN_NETWORK']['dhcp_gateway'],
 
   cobbler_host     => $cobbler_host,
   cobbler_url      => $cobbler_url,

deployment/puppet/nailgun/manifests/init.pp

@@ -34,6 +34,7 @@ class nailgun(
   $dhcp_netmask       = $::fuel_settings['ADMIN_NETWORK']['netmask'],
   $dhcp_mac           = $::fuel_settings['ADMIN_NETWORK']['mac'],
   $dhcp_interface     = $::fuel_settings['ADMIN_NETWORK']['interface'],
+  $dhcp_gateway       = $::fuel_settings['ADMIN_NETWORK']['dhcp_gateway'],
 
   $mco_pskey = "unset",
   $mco_vhost = "mcollective",
@@ -151,6 +152,7 @@ class nailgun(
     admin_network_netmask => $::fuel_settings['ADMIN_NETWORK']['netmask'],
     admin_network_mac     => $::fuel_settings['ADMIN_NETWORK']['mac'],
     admin_network_ip      => $::fuel_settings['ADMIN_NETWORK']['ipaddress'],
+    admin_network_gateway => $::fuel_settings['ADMIN_NETWORK']['dhcp_gateway'],
 
     cobbler_host     => $cobbler_host,
     cobbler_url      => $cobbler_url,
@@ -233,7 +235,7 @@ class nailgun(
     dhcp_start_address => $dhcp_start_address,
     dhcp_end_address   => $dhcp_end_address,
     dhcp_netmask       => $dhcp_netmask,
-    dhcp_gateway       => $cobbler_host,
+    dhcp_gateway       => $dhcp_gateway,
     dhcp_interface     => $dhcp_interface,
     nailgun_api_url    => $nailgun_api_url,
   }

deployment/puppet/nailgun/manifests/venv.pp

@@ -31,6 +31,7 @@ class nailgun::venv(
   $admin_network_netmask,
   $admin_network_mac,
   $admin_network_ip,
+  $admin_network_gateway,
 
   $cobbler_host,
   $cobbler_url,

deployment/puppet/nailgun/templates/settings.yaml.erb

@@ -45,6 +45,7 @@ ADMIN_NETWORK:
   size: "<%= @admin_network_size %>"
   first: "<%= @admin_network_first %>"
   last: "<%= @admin_network_last %>"
+  gateway: "<%= @admin_network_gateway %>"
 
 VLANS_RANGE_START: "100"
 VLANS_RANGE_END: "1000"