diff options
Diffstat (limited to 'mcp/config/states/baremetal_init')
| -rwxr-xr-x | mcp/config/states/baremetal_init | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init index 358e1874d..dcedfbeda 100755 --- a/mcp/config/states/baremetal_init +++ b/mcp/config/states/baremetal_init @@ -14,7 +14,6 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/xdf_data.sh" cluster_nodes_query="${control_nodes_query} or cmp*" -compute_nodes_query='cmp*' # KVM, compute node prereqs # patch the networking module for Debian based distros @@ -26,13 +25,16 @@ salt -C "${cluster_nodes_query}" file.replace $debian_ip_source \ pattern="^\s{8}__salt__\['pkg.install'\]\('vlan'\)" \ repl="\n if not __salt__['pkg.version']('vlan'):\n __salt__['pkg.install']('vlan')" -salt -C "${cluster_nodes_query}" pkg.install bridge-utils -salt -C "${control_nodes_query}" state.apply linux.network,linux.system.kernel +salt -C "${cluster_nodes_query}" state.apply linux.system.repo +salt -C "${cluster_nodes_query}" pkg.install force_yes=true bridge-utils,python-jinja2 +salt -C "${cluster_nodes_query}" service.restart salt-minion wait_for 5.0 "salt -C '${cluster_nodes_query}' state.apply salt.minion" -wait_for 5.0 "salt -C '${compute_nodes_query}' state.apply linux.system,linux.network" +salt -C "${cluster_nodes_query}" file.remove /etc/resolv.conf +salt -C "${cluster_nodes_query}" file.touch /etc/resolv.conf +wait_for 5.0 "salt -C '${cluster_nodes_query}' state.apply linux,ntp" wait_for 30.0 "salt -C '${cluster_nodes_query}' test.ping" -salt -C "${cluster_nodes_query}" system.reboot +salt -C "${cluster_nodes_query}" cmd.run 'reboot' wait_for 90.0 "salt -C '${cluster_nodes_query}' test.ping" salt -C "${cluster_nodes_query}" state.apply linux,ntp |