diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-26 20:10:54 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-26 18:51:33 +0000 |
commit | 42bfa72f399d2465f6527a21ff47e16cb587cb1a (patch) | |
tree | 7d7058fd46d8b172668b8b95cbf86e5c67a978fc /patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch | |
parent | b03b4742daeac3e46a5225dc11880a8a099bdcfe (diff) |
u/fuel: Bump & rebase for MaaS boot src selection
Change-Id: I12a84a05dc26edb78f6f21a98e446b22babfd7c7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 5bb8d21f085fdbd1d7b664b7036565f66c15af68)
Diffstat (limited to 'patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch')
-rw-r--r-- | patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch index 0b5a0234..b7c1bec0 100644 --- a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch +++ b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch @@ -66,13 +66,13 @@ index 00000000..0368937d + file.managed: + - source: salt://maas/files/pgpass diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index dfb0df77..96025157 100644 +index 6a6e7a36..3632a92b 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -16,3 +16,4 @@ - /usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch +@@ -17,3 +17,4 @@ /usr/share/salt-formulas/env: 0012-routes-Skip-network-restart-on-noifupdown.patch /usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.patch + /usr/share/salt-formulas/env: 0016-Set-boot-source-selections.patch +/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml index e83de35c..226a4f66 100644 |