create mode 100644 mcp/salt-formulas/armband/salt_minion.sls
diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
-index a7941e00..0c41557d 100755
+index 891eae36..54ffb873 100755
--- a/mcp/config/states/baremetal_init
+++ b/mcp/config/states/baremetal_init
@@ -35,6 +35,7 @@ wait_for 30.0 "salt -C 'kvm* or cmp*' test.ping"
create mode 100644 mcp/salt-formulas/opnfv/adduser.sls
diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
-index 0c41557d..799a9419 100755
+index 54ffb873..07dcef27 100755
--- a/mcp/config/states/baremetal_init
+++ b/mcp/config/states/baremetal_init
@@ -23,6 +23,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \
+salt -C 'kvm* or cmp*' state.apply opnfv.adduser
salt -C 'kvm*' state.apply linux.network,linux.system.kernel
salt -C 'kvm* or cmp*' state.apply salt.minion
- salt -C 'cmp*' state.apply linux.system
+ wait_for 5.0 "salt -C 'cmp*' state.apply linux.system"
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index 02a813c9..a179b22c 100755
--- a/mcp/config/states/virtual_control_plane