diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-18 17:43:05 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-18 17:43:05 +0200 |
| commit | a8e91b8bd86bac7a16f752e9664eeb3133997c39 (patch) | |
| tree | 5a6398298d882b0954777f5d0102ea0c6f80c549 | |
| parent | 58ac2e3b0735c616e6712e095a419c31b91c1e9d (diff) | |
linux.network: Fix noifupdown in linux/map.jinja
Previous changes attempted to add 'noifupdown' support, but failed
to spell it correctly. Fix the typo and also edit the 'maas' state
to use simple `salt state.apply` instead of `cmd.run 'salt-call'`.
Change-Id: If9889dee896fa100febe0372fe2c4173fc223ee3
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
| -rwxr-xr-x | mcp/config/states/maas | 5 | ||||
| -rw-r--r-- | mcp/patches/0006-linux.network.interface-noifupdown-support.patch | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mcp/config/states/maas b/mcp/config/states/maas index 7b3bb6433..e470cea80 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -41,8 +41,9 @@ salt -C 'mas01*' pillar.item\ # KVM, compute node prereqs (libvirt first), VCP deployment salt -C '* and not cfg01* and not mas01*' saltutil.sync_all -salt 'kvm*' pkg.install bridge-utils -salt 'kvm*' cmd.run 'salt-call state.sls linux.network; reboot' +salt -C 'kvm*' pkg.install bridge-utils +salt -C 'kvm*' state.apply linux.network +salt -C 'kvm*' system.reboot wait_for "! salt '*' test.ping | fgrep -q 'Not connected'" salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp diff --git a/mcp/patches/0006-linux.network.interface-noifupdown-support.patch b/mcp/patches/0006-linux.network.interface-noifupdown-support.patch index f4b7de803..5d9ce7be5 100644 --- a/mcp/patches/0006-linux.network.interface-noifupdown-support.patch +++ b/mcp/patches/0006-linux.network.interface-noifupdown-support.patch @@ -20,7 +20,7 @@ index d3227ca..8a2243d 100644 'updelay', 'hashing-algorithm', 'hardware-dma-ring-rx', -+ 'ifupdown', ++ 'noifupdown', ] %} {% set network = salt['grains.filter_by']({ |