X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Fconfig%2Fstates%2Fvirtual_init;h=77f4f5494a4883571ad6a7ba4f5bec1fc9279c85;hb=5440500624a503b3f91852cd17089aab76afe806;hp=e8837571b566f21970ba2cc0856bc571aa99b3d3;hpb=3c34bab9279d5dbe7df3824131e4487e5017ef15;p=fuel.git

diff --git a/mcp/config/states/virtual_init b/mcp/config/states/virtual_init
index e8837571b..77f4f5494 100755
--- a/mcp/config/states/virtual_init
+++ b/mcp/config/states/virtual_init
@@ -31,9 +31,13 @@ wait_for 3.0 "(for n in ${LOCAL_VIRT_NODES}; do salt -C \${n}.* test.ping || exi
 wait_for 3.0 "salt -C 'E@^(${NODE_MASK}).*' saltutil.sync_all"
 [[ ! "${NODE_MASK}" =~ mas01 ]] || exit 0
 
-wait_for 3.0 "salt -C 'E@^(${NODE_MASK}).*' state.sls linux"
+if [[ "${base_image}" =~ centos ]]; then
+  # CentOS uses an older kernel, skip non-existing sysctl options
+  EXCLUDE_IDS="exclude='[{id: linux_kernel_net.core.netdev_budget_usecs}]'"
+fi
+wait_for 3.0 "salt -C 'E@^(${NODE_MASK}).*' state.sls linux ${EXCLUDE_IDS}"
 
-salt -C "E@^(${NODE_MASK}).*" system.reboot
+salt -C "E@^(${NODE_MASK}).*" cmd.run 'reboot'
 wait_for 90.0 "salt -C 'E@^(${NODE_MASK}).*' test.ping"
 wait_for 3.0 "salt -C 'E@^(${NODE_MASK}).*' pkg.upgrade refresh=False dist_upgrade=True"
 wait_for 3.0 "salt -C 'E@^(${NODE_MASK}).*' state.apply salt,ntp"