diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-28 19:45:08 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-28 19:48:36 +0200 |
| commit | 2da79800d8ee9bc4210740255a42f7ec7a65c072 (patch) | |
| tree | 4ea8e4651f485b918a2fe51732583c511e852eb0 /patches/opnfv-fuel/0016-mcp-salt-formulas-armband-AArch64-bootstrap.patch | |
| parent | e0d9c392488c74393574fcd93ad1f8a3ad576130 (diff) | |
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 <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0016-mcp-salt-formulas-armband-AArch64-bootstrap.patch')
| -rw-r--r-- | patches/opnfv-fuel/0016-mcp-salt-formulas-armband-AArch64-bootstrap.patch | 4 |
1 files changed, 2 insertions, 2 deletions
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 <Alexandru.Avadanii@enea.com> 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 |