diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-02 06:03:48 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-03 04:54:04 +0100 |
| commit | bf5e0b539fafdc2bf26bb1b0d49327f851c62fb3 (patch) | |
| tree | 44a6ef37ba38cb93ef7b2522f346ca6848121c37 /patches/opnfv-fuel/0013-glusterfs-Use-3.12-for-AArch64.patch | |
| parent | 6eab8c989c257213586347f284362cc43f99d3f4 (diff) | |
u/fuel: Bump & rebase for MaaS proxy support
While at it, fix duplicate "file.repl" entry in armband.nova_config
SLS and drop upstream nova patch for Qemu 2.10 support previously
backported.
Fixes: f191bfb
Change-Id: Ib4e56833df8e1095396af0856a0fad06f5e9ed1c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0013-glusterfs-Use-3.12-for-AArch64.patch')
| -rw-r--r-- | patches/opnfv-fuel/0013-glusterfs-Use-3.12-for-AArch64.patch | 8 |
1 files changed, 4 insertions, 4 deletions
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 6949ce82..9b21add2 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 @@ -21,10 +21,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml -index 8c0fd73..24d5723 100644 +index 166b368..0c7f0c3 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml -@@ -26,7 +26,7 @@ classes: +@@ -27,7 +27,7 @@ classes: parameters: _param: linux_system_codename: xenial @@ -34,10 +34,10 @@ index 8c0fd73..24d5723 100644 cluster_node01_address: ${_param:infra_kvm_node01_address} cluster_node02_address: ${_param:infra_kvm_node02_address} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml -index df23754..e3db1b0 100644 +index 9e8ad09..ddff3db 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml -@@ -35,7 +35,7 @@ parameters: +@@ -36,7 +36,7 @@ parameters: keepalived_vip_virtual_router_id: 69 loopback_device_size: 20 linux_system_codename: xenial |