[baremetal] Disable dhcp offered routes 09/50509/1
authorMichael Polenchuk <mpolenchuk@mirantis.com>
Thu, 11 Jan 2018 10:53:46 +0000 (14:53 +0400)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Fri, 12 Jan 2018 17:45:01 +0000 (18:45 +0100)
Prevent dhcp client from setting an unwanted
default routes on compute nodes.

Conflicts:
mcp/reclass/classes/system

[stable/euphrates cherry-pick]
Drop reclass system submodule bump, only applicable to master.

Change-Id: I2529491bbc977647e5f457d5f1ba88b0cc4372ee
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 658418ea84e633f5f97a706a075d7e2f24127999)

mcp/config/states/baremetal_init

index 5a8cb49..1d38201 100755 (executable)
@@ -28,6 +28,11 @@ salt -C 'kvm* or cmp*' state.apply salt.minion
 salt -C 'kvm* or cmp*' service.force_reload salt-minion
 salt -C 'cmp*' state.apply linux.system
 salt -C 'cmp*' state.apply linux.network || true
+
+# disable dhcp offered routes on compute nodes
+salt -C 'cmp*' file.write /etc/dhcp/dhclient-enter-hooks.d/no-default-route \
+  args='unset new_routers'
+
 salt -C 'kvm* or cmp*' system.reboot
 wait_for 90.0 "salt -C 'kvm* or cmp*' test.ping"