From 18df834544a05cc4f49f6cc1acb896b804be6b23 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 19 Jun 2018 15:56:28 +0200 Subject: u/fuel: Bump & rebase for static PXE/admin IPs Change-Id: Ic86aad4afb74f6254ae8362db03a88e5e8cf967a --- .../0003-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'patches/opnfv-fuel/0003-mcp-salt-formulas-armband-Extend-libvirt_domain.patch') diff --git a/patches/opnfv-fuel/0003-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0003-mcp-salt-formulas-armband-Extend-libvirt_domain.patch index 57a9a9ca..086cfcab 100644 --- a/patches/opnfv-fuel/0003-mcp-salt-formulas-armband-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0003-mcp-salt-formulas-armband-Extend-libvirt_domain.patch @@ -41,12 +41,12 @@ Signed-off-by: Alexandru Avadanii create mode 100644 mcp/salt-formulas/armband/salt_minion.sls diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init -index c0233389..5a1e9ab7 100755 +index 6a44b788..6f935445 100755 --- a/mcp/config/states/baremetal_init +++ b/mcp/config/states/baremetal_init -@@ -35,6 +35,7 @@ wait_for 30.0 "salt -C 'kvm* or cmp*' test.ping" - salt -C 'cmp*' file.write /etc/dhcp/dhclient-enter-hooks.d/no-default-route \ - args='unset new_routers' +@@ -31,6 +31,7 @@ wait_for 5.0 "salt -C 'kvm* or cmp*' state.apply opnfv.route_wrapper" + wait_for 5.0 "salt -C 'cmp*' state.apply linux.network" + wait_for 30.0 "salt -C 'kvm* or cmp*' test.ping" +salt -C 'kvm*' state.apply armband.salt_minion salt -C 'kvm* or cmp*' system.reboot -- cgit 1.2.3-korg