summaryrefslogtreecommitdiffstats
path: root/mcp/config
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-11-21 00:16:09 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-11-21 00:16:09 +0200
commitdc2e7381046ef617d1bf1af2261e9e84627bb8c4 (patch)
tree7061cf8ed52d7462e79018bb5e50a00e080c054b /mcp/config
parentde76e69ed608c8b631349c4733defc2f749858f7 (diff)
[vcp] kvm: Re-apply sysctl settings after libvirt
libvirt postinstall script configures `virbr0` by default, which we later remove & disable. However, on network creation, libvirt also enables ip_forward, so re-run kernel.sls to force it to 0 without a reboot. Change-Id: Ie27fbf995c10ad9cd0fa0c28c29bd88161f04fd7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/config')
-rwxr-xr-xmcp/config/states/virtual_control_plane2
1 files changed, 1 insertions, 1 deletions
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index ef6ce59c3..5b54bb8a4 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -34,7 +34,7 @@ fi
wait_for 5.0 "salt -C 'kvm*' state.sls libvirt"
salt -C 'kvm* or cmp*' state.apply salt
-wait_for 10.0 "salt -C 'kvm*' state.sls salt.control"
+wait_for 10.0 "salt -C 'kvm*' state.sls salt.control,linux.system.kernel"
vcp_nodes=$(salt --out yaml 'kvm01*' pillar.get salt:control:cluster:internal:node | \
awk '/\s+\w+[[:digit:]]+:$/ {gsub(/:$/, "*"); printf "%s ", $1}')