From a8e91b8bd86bac7a16f752e9664eeb3133997c39 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 18 Aug 2017 17:43:05 +0200 Subject: 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 --- mcp/config/states/maas | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mcp/config/states') 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 -- cgit 1.2.3-korg