diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-11-21 00:16:09 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-11-21 15:14:16 +0000 |
| commit | cc60adcf859084607f95f44b1f7b76ce44e0b465 (patch) | |
| tree | c19b83019874b2cb2ed35b09f03d22d050c5f878 | |
| parent | ed525238b75e0cc5dc652dcac4330d02e66a6c8b (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>
(cherry picked from commit dc2e7381046ef617d1bf1af2261e9e84627bb8c4)
| -rwxr-xr-x | mcp/config/states/virtual_control_plane | 2 |
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}') |