aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-03-04 21:49:10 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-03-04 21:51:20 +0100
commitf822b452fe66413a29af88be120a00897527b9a1 (patch)
treed7055002a29f81c2ac06768d05e88f8b7d42d949
parent732b0f9d9f3bcae72de6de4d10ddcac5fd5fe391 (diff)
u/fuel: Bump & rebase for IP allocation rework
Change-Id: I51699789c2485c758b9960ec689c1f436a57dd8d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch6
-rw-r--r--patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch6
-rw-r--r--patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch4
m---------upstream/fuel0
4 files changed, 8 insertions, 8 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 a4f0a68..2329cb5 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 0000000..0368937
+ file.managed:
+ - source: salt://maas/files/pgpass
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 22d5a7a..1229fc5 100644
+index 2dd6385..71249d1 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -18,3 +18,4 @@
+@@ -17,3 +17,4 @@
/usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch
/usr/share/salt-formulas/env: 0012-routes-Skip-network-restart-on-noifupdown.patch
- /usr/share/salt-formulas/env: 0013-dpdk-Support-ovs-bridge-tagging.patch
+ /usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.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 e83de35..226a4f6 100644
diff --git a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
index 3e989b4..0f53f4f 100644
--- a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
@@ -150,12 +150,12 @@ index 0000000..78eb0bf
+
+ #salt_control_seed_{{ cluster_name }}_{{ node_name }}:
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 1229fc5..3af44ef 100644
+index 71249d1..1d59a11 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -19,3 +19,5 @@
+@@ -18,3 +18,5 @@
/usr/share/salt-formulas/env: 0012-routes-Skip-network-restart-on-noifupdown.patch
- /usr/share/salt-formulas/env: 0013-dpdk-Support-ovs-bridge-tagging.patch
+ /usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.patch
/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
+/usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch
+/usr/share/salt-formulas/env: 0104-salt-control-virt-Extend-libvirt_domain.patch
diff --git a/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch
index 2c5fed3..578fcdf 100644
--- a/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch
+++ b/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch
@@ -49,10 +49,10 @@ index 0000000..d40e63b
+ cmd += 'else sh {0} -c /tmp {1}; fi'.format(
+ os.path.join(tmppath, 'bootstrap-salt.sh'), arg)
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 3af44ef..3f2e99a 100644
+index 1d59a11..b64cffc 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -21,3 +21,4 @@
+@@ -20,3 +20,4 @@
/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
/usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch
/usr/share/salt-formulas/env: 0104-salt-control-virt-Extend-libvirt_domain.patch
diff --git a/upstream/fuel b/upstream/fuel
-Subproject 8387dd44747d3e17269289c096edaecdaaee573
+Subproject 308ea8aa7e6f29d674de9621d235993636ff037