From 7a24c81190124e7fc3005a368d50f52c9abd3257 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 22 Feb 2018 02:40:14 +0100 Subject: u/fuel: Bump & rebase for cinder disk volume JIRA: FUEL-330 Change-Id: If089aa41a77a9694ae99dfee79a105ac92917416 Signed-off-by: Alexandru Avadanii --- .../0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch | 4 ++-- .../0006-maas-boot-resources-Add-arm64-architecture.patch | 2 +- .../opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch | 6 +++--- patches/opnfv-fuel/0013-glusterfs-Use-3.12-for-AArch64.patch | 6 +++--- upstream/fuel | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch b/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch index 287521b4..e446d5fd 100644 --- a/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch +++ b/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch @@ -37,7 +37,7 @@ index df23045..5bbe0fe 100644 - service.keepalived.cluster.single - system.glusterfs.server.volume.glance diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml -index cb10bbb..6277c97 100644 +index cb7b32f..dd610ea 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml @@ -7,6 +7,7 @@ @@ -46,5 +46,5 @@ index cb10bbb..6277c97 100644 classes: + - system.linux.system.repo.mcp.armband - system.linux.system.repo.glusterfs - - system.linux.storage.loopback - system.glusterfs.client.cluster + - system.nova.compute.cluster diff --git a/patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch b/patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch index 13be763b..6a0ce3d8 100644 --- a/patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch +++ b/patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch @@ -16,7 +16,7 @@ Signed-off-by: Alexandru Avadanii 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mcp/patches/0003-maas-region-force-artifact-download.patch b/mcp/patches/0003-maas-region-force-artifact-download.patch -index 6e6c18f..e75fcaa 100644 +index b61a3d1..e38b6c1 100644 --- a/mcp/patches/0003-maas-region-force-artifact-download.patch +++ b/mcp/patches/0003-maas-region-force-artifact-download.patch @@ -50,7 +50,7 @@ diff --git a/maas/files/maas-artifact-sync.sh b/maas/files/maas-artifact-sync.sh diff --git a/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch b/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch index 5e918efd..c603663d 100644 --- a/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch +++ b/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch @@ -20,11 +20,11 @@ Signed-off-by: Charalampos Kominos 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml -index 6277c97..786ac4c 100644 +index dd610ea..407751f 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml -@@ -12,8 +12,8 @@ classes: - - system.linux.storage.loopback +@@ -11,8 +11,8 @@ classes: + - system.linux.system.repo.glusterfs - system.glusterfs.client.cluster - system.nova.compute.cluster - - system.nova.compute.nfv.hugepages diff --git a/patches/opnfv-fuel/0013-glusterfs-Use-3.12-for-AArch64.patch b/patches/opnfv-fuel/0013-glusterfs-Use-3.12-for-AArch64.patch index ca85d602..ce3ccb88 100644 --- a/patches/opnfv-fuel/0013-glusterfs-Use-3.12-for-AArch64.patch +++ b/patches/opnfv-fuel/0013-glusterfs-Use-3.12-for-AArch64.patch @@ -34,12 +34,12 @@ index 84b392e..1209f31 100644 cluster_node01_address: ${_param:infra_kvm_node01_address} cluster_node02_address: ${_param:infra_kvm_node02_address} diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml -index 786ac4c..379c1d0 100644 +index 407751f..b0e23d0 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml -@@ -37,7 +37,7 @@ parameters: +@@ -35,7 +35,7 @@ parameters: + keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 - loopback_device_size: 20 linux_system_codename: xenial - glusterfs_version: '3.13' + glusterfs_version: '3.12' diff --git a/upstream/fuel b/upstream/fuel index 578aaada..a854b615 160000 --- a/upstream/fuel +++ b/upstream/fuel @@ -1 +1 @@ -Subproject commit 578aaada4233d2ef311112e684d8a22e64be3af1 +Subproject commit a854b61568c2f615672f17868e2cfe31d97c751f -- cgit 1.2.3-korg