aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-21 01:41:34 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-21 00:42:13 +0000
commitc2cbc385587fde98b0b57e80952c08ca189e63d1 (patch)
treed0d6b54b917013d4bf2654ccdad3074ec41cc87c
parentb23e59e31cddaa44361d429c2325a0f648c583c2 (diff)
u/fuel: Bump & rebase for LVM filter fix
Change-Id: I3696b3d778d60c267fbb03475f858554d9b18142 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 0a47ab95fd9b99418d8bfa19a6bcb501de0d0e5d)
-rw-r--r--patches/opnfv-fuel/0004-maas-Add-curtin_userdata_arm64_generic_xenial.patch6
-rw-r--r--patches/opnfv-fuel/0006-libvirt-Use-libvirt-unix_sock_group.patch6
-rw-r--r--patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch6
-rw-r--r--patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch4
m---------upstream/fuel0
5 files changed, 11 insertions, 11 deletions
diff --git a/patches/opnfv-fuel/0004-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/patches/opnfv-fuel/0004-maas-Add-curtin_userdata_arm64_generic_xenial.patch
index ca6e7e68..18e82e32 100644
--- a/patches/opnfv-fuel/0004-maas-Add-curtin_userdata_arm64_generic_xenial.patch
+++ b/patches/opnfv-fuel/0004-maas-Add-curtin_userdata_arm64_generic_xenial.patch
@@ -102,11 +102,11 @@ index 0000000..b969e07
++{{endif}}
++{% endraw %}
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index fb5a14c..6946c9f 100644
+index d0bb7c4..7c5bf15 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -16,3 +16,4 @@
- /usr/share/salt-formulas/env: 0009-seedng-module-Sync-salt-version.patch
+@@ -17,3 +17,4 @@
/usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
/usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.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/patches/opnfv-fuel/0006-libvirt-Use-libvirt-unix_sock_group.patch b/patches/opnfv-fuel/0006-libvirt-Use-libvirt-unix_sock_group.patch
index 432a14c8..3411aad9 100644
--- a/patches/opnfv-fuel/0006-libvirt-Use-libvirt-unix_sock_group.patch
+++ b/patches/opnfv-fuel/0006-libvirt-Use-libvirt-unix_sock_group.patch
@@ -48,11 +48,11 @@ index 0000000..003b249
+ # Set the UNIX socket permissions for the R/O socket. This is used
+ # for monitoring VM status only
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 6946c9f..d3352cc 100644
+index 7c5bf15..218ed51 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -17,3 +17,4 @@
- /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
+@@ -18,3 +18,4 @@
/usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.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
+/usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch
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 ba5f2952..6ab94073 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,11 +150,11 @@ index 0000000..a9fe11b
+
+ #salt_control_seed_{{ cluster_name }}_{{ node_name }}:
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index d3352cc..059e3ef 100644
+index 218ed51..2f12b7f 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -18,3 +18,5 @@
- /usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch
+@@ -19,3 +19,5 @@
+ /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
/usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch
+/usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch
diff --git a/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch
index 3e743ec5..86a6b1d5 100644
--- a/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch
+++ b/patches/opnfv-fuel/0010-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 059e3ef..87336d5 100644
+index 2f12b7f..6ba59aa 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -20,3 +20,4 @@
+@@ -21,3 +21,4 @@
/usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.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 69902a264c8090447ea141044c6cf5747bf8931
+Subproject d7927a5e63e5314c2a81970150b849b0b9d0bd4