aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/config/states/baremetal_init
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-02-11 11:04:59 +0000
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-03-29 15:04:14 +0100
commit7a31d776d4bdf122d4c4c8f732304cc83621bdd6 (patch)
tree20acf2b9278434be4c94b3fa93d186386c1be1cb /mcp/config/states/baremetal_init
parentd7f96d14441eafda776d3c6475b8b0d93d91de39 (diff)
[akraino] Add IEC K8-calico scenarios
- bump Pharos git submodule to allow PODs with fewer nodes; - add `k8-calico-iec-noha` scenario definition for Akraino IEC basic configuration; - add `k8-calico-iec-vcp-noha` scenario definition for Akraino IEC nested (virtualized control plane) configuration; - add `akraino_iec` state, which will leverage the Akraino IEC bootstrap scripts from [1]; - replace system.reboot salt call with cmd.run 'reboot' as it's more reliable; - use kernel 4.15 for AArch64 K8 IEC scenarios; NOTE: These scenarios will not be released in OPNFV since don't rely on Salt formulas but instead of Akraino IEC scripts to install K8s. [1] https://gerrit.akraino.org/r/#/q/project:iec Change-Id: I4e538e0563d724cd3fd5c4d462ddc22d0c739402 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/config/states/baremetal_init')
-rwxr-xr-xmcp/config/states/baremetal_init7
1 files changed, 3 insertions, 4 deletions
diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
index ba7ae30e5..992821571 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
@@ -27,12 +26,12 @@ salt -C "${cluster_nodes_query}" file.replace $debian_ip_source \
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.system.repo,linux.network,linux.system.kernel
+salt -C "${cluster_nodes_query}" state.apply linux.system.repo
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"
+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