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>

diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index 7b3bb64..e470cea 100755 (executable)
--- 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 f4b7de8..5d9ce7b 100644 (file)
--- 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']({