diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-23 19:16:30 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-23 18:35:18 +0000 |
| commit | 1d42906057483865e5e8344fc186ea6299c7daf4 (patch) | |
| tree | 7e78a7753ff933797fc2f8d510c71275bc713bde /patches/opnfv-fuel/0004-maas-Add-curtin_userdata_arm64_generic_xenial.patch | |
| parent | 9b542ee2202c702445128e019b2454960d828651 (diff) | |
u/fuel: Bump & rebase for MaaS fabrics fix
Change-Id: I58bacd2b8f9d210fd9e144cd8db6239ca0b8949d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 812d2f0ef3b7f638a29f10770007ef249d609c2c)
Diffstat (limited to 'patches/opnfv-fuel/0004-maas-Add-curtin_userdata_arm64_generic_xenial.patch')
| -rw-r--r-- | patches/opnfv-fuel/0004-maas-Add-curtin_userdata_arm64_generic_xenial.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/opnfv-fuel/0004-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/patches/opnfv-fuel/0004-maas-Add-curtin_userdata_arm64_generic_xenial.patch index 05ef0267..3e17f899 100644 --- a/patches/opnfv-fuel/0004-maas-Add-curtin_userdata_arm64_generic_xenial.patch +++ b/patches/opnfv-fuel/0004-maas-Add-curtin_userdata_arm64_generic_xenial.patch @@ -64,13 +64,13 @@ index 0000000..0368937 + file.managed: + - source: salt://maas/files/pgpass diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index d0bb7c4..7c5bf15 100644 +index 6358109..4f6cc56 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -17,3 +17,4 @@ - /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch +@@ -18,3 +18,4 @@ /usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch + /usr/share/salt-formulas/env: 0013-maas-region-Allow-subnets-without-fabrics.patch +/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml index e8c2965..b15f9cb 100644 |