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/0009-maas-Add-curtin_userdata_arm64_generic_xenial.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/0009-maas-Add-curtin_userdata_arm64_generic_xenial.patch')
| -rw-r--r-- | patches/opnfv-fuel/0009-maas-Add-curtin_userdata_arm64_generic_xenial.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/opnfv-fuel/0009-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/patches/opnfv-fuel/0009-maas-Add-curtin_userdata_arm64_generic_xenial.patch index aa521a1f..985dd65d 100644 --- a/patches/opnfv-fuel/0009-maas-Add-curtin_userdata_arm64_generic_xenial.patch +++ b/patches/opnfv-fuel/0009-maas-Add-curtin_userdata_arm64_generic_xenial.patch @@ -94,11 +94,11 @@ index 0000000..b969e07 ++{{endif}} ++{% endraw %} diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 1a651cf..c66ecb0 100644 +index 419ff26..dbc72db 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -5,3 +5,4 @@ - /usr/share/salt-formulas/env: 0005-maas-module-Obtain-fabric-ID-from-CIDR.patch +@@ -6,3 +6,4 @@ /usr/share/salt-formulas/env: 0006-maas-module-Add-VLAN-DHCP-enable-support.patch /usr/share/salt-formulas/env: 0007-linux.network.interface-noifupdown-support.patch + /usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch +/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch |