From 2da79800d8ee9bc4210740255a42f7ec7a65c072 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 28 Aug 2017 19:45:08 +0200 Subject: p/fuel: Rebase for os cacert While rebasing, drop batch apply of linux.network state for VCP nodes, as it does not fix the underlying problem and only introduces extra delay. Reverts commits: 4f1bfdd Change-Id: I365b029aa2855334e295907cdde623b1717fc69a Signed-off-by: Alexandru Avadanii --- .../opnfv-fuel/0016-mcp-salt-formulas-armband-AArch64-bootstrap.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'patches/opnfv-fuel/0016-mcp-salt-formulas-armband-AArch64-bootstrap.patch') diff --git a/patches/opnfv-fuel/0016-mcp-salt-formulas-armband-AArch64-bootstrap.patch b/patches/opnfv-fuel/0016-mcp-salt-formulas-armband-AArch64-bootstrap.patch index 154b8241..7bdfbad8 100644 --- a/patches/opnfv-fuel/0016-mcp-salt-formulas-armband-AArch64-bootstrap.patch +++ b/patches/opnfv-fuel/0016-mcp-salt-formulas-armband-AArch64-bootstrap.patch @@ -24,7 +24,7 @@ Signed-off-by: Alexandru Avadanii create mode 100644 mcp/salt-formulas/armband/files/cloud.py.diff diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index fcb8ce3..12ef9ed 100755 +index 5e1dca1..9e0093b 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -76,6 +76,7 @@ salt -C '* and not cfg01* and not mas01*' saltutil.sync_all @@ -33,7 +33,7 @@ index fcb8ce3..12ef9ed 100755 salt -C 'kvm*' state.apply linux.network +salt -C 'kvm*' state.apply armband.bootstrap_script_arm64 salt -C 'kvm*' system.reboot - wait_for 90 "! salt '*' test.ping | tee /dev/stderr | fgrep -q 'Not connected'" + wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | fgrep -q 'Not connected'" diff --git a/mcp/salt-formulas/armband/bootstrap_script_arm64.sls b/mcp/salt-formulas/armband/bootstrap_script_arm64.sls new file mode 100644 -- cgit 1.2.3-korg