diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-27 17:12:58 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-27 17:12:58 +0100 |
commit | 01e02374e99162c86e8f18aaaba5f8071aad21dd (patch) | |
tree | 8e3879851c68815e558c3dabce8140e835fa7e91 /patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch | |
parent | 56e298f07ed973a751d377bbb123cf9177520b72 (diff) |
u/fuel: Bump & rebase for MaaS patch squash
Change-Id: Ibbdb467b4656493c6effa68991dab1902e78b7fe
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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 3e45d22a..6431c942 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 @@ -64,12 +64,12 @@ index 0000000..0368937 + file.managed: + - source: salt://maas/files/pgpass diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 56c3f1c..ab9676d 100644 +index cd32378..fc2ddea 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -15,3 +15,4 @@ +@@ -14,3 +14,4 @@ + /usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch - /usr/share/salt-formulas/env: 0011-maas-region-interface-default-mode-DHCP.patch /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch +/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml |