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>2018-01-29 23:52:57 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-29 23:55:38 +0100
commita5aa1b1a42bd9d067e535636e86cd5189d3fef53 (patch)
treeaeaff7e62f69df9a833235f82a97d0cf9c390397 /patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
parentb8a5f2593d1c9a920e41bedec9ee3467200bedea (diff)
u/fuel: Bump & rebase for ODL fix after Pike mv
Upstream changed salt-formula-neutron to have custom, dedicated configuration for Pike, silently breaking our ODL support. Change-Id: Iaccfed65132699ca7d0c0bb5eee5c2ca13b1ce28 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.patch2
1 files changed, 1 insertions, 1 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 30280b3c..85ee6b56 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
@@ -75,7 +75,7 @@ index 34d913a..01e3224 100644
/usr/share/salt-formulas/env: 0013-dpdk-Support-ovs-bridge-tagging.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 da28abf..65e6557 100644
+index 3bf87dc..4954559 100644
--- 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
@@ -40,6 +40,42 @@ parameters: