summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-21 18:42:04 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-21 18:42:58 +0100
commit17e0f24e018fc3fce2e46b5c6e4948f91ebe63d7 (patch)
treeb5e6aca5c0f81a3fdde1320a1bacf7a85c06695d /patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
parent569c2cc53dc3a65140978c2bfa89db1500aba1a0 (diff)
u/fuel: Bump & rebase for upstream libvirtd socket
Change-Id: I4a5cb78eff164fe9984362b51c34a8359baa8a8d 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.patch6
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 c275b04f..3e45d22a 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,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 d16e3c2..0e1b7f6 100644
+index 56c3f1c..ab9676d 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -16,3 +16,4 @@
+@@ -15,3 +15,4 @@
+ /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: 0013-libvirt-unix_sock_group-s-libvirtd-libvirt.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
index 6332776..7292ebb 100644