summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
Diffstat (limited to 'patches')
-rw-r--r--patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch4
-rw-r--r--patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch54
-rw-r--r--patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch8
-rw-r--r--patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch6
-rw-r--r--patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch10
-rw-r--r--patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch4
-rw-r--r--patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch44
7 files changed, 102 insertions, 28 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 ecbe3a5b..ae0c4d11 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
@@ -20,8 +20,8 @@ handle it via Salt for baremetal kvm* and cmp* nodes.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml | 1 +
- mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml | 1 +
+ mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml | 1 +
+ .../classes/cluster/mcp-pike-common-ha/openstack_compute.yml | 1 +
2 files changed, 2 insertions(+)
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
diff --git a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch
index eb9d6a74..64115f87 100644
--- a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch
@@ -26,16 +26,16 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- mcp/config/states/openstack_ha | 1 +
- mcp/config/states/openstack_noha | 2 +
- mcp/config/states/virtual_control_plane | 1 +
- .../armband/files/nova-libvirt-aarch64-rollup.diff | 76 ++++++++++++++++++++++
- mcp/salt-formulas/armband/init.sls | 7 ++
- mcp/salt-formulas/armband/nova_config.sls | 35 ++++++++++
- mcp/salt-formulas/armband/nova_libvirt.sls | 7 ++
- mcp/salt-formulas/armband/qemu_efi.sls | 2 +
- mcp/salt-formulas/armband/vgabios.sls | 7 ++
- 9 files changed, 138 insertions(+)
+ mcp/config/states/openstack_ha | 1 +
+ mcp/config/states/openstack_noha | 2 +
+ mcp/config/states/virtual_control_plane | 1 +
+ .../files/nova-libvirt-aarch64-rollup.diff | 106 ++++++++++++++++++
+ mcp/salt-formulas/armband/init.sls | 7 ++
+ mcp/salt-formulas/armband/nova_config.sls | 35 ++++++
+ mcp/salt-formulas/armband/nova_libvirt.sls | 7 ++
+ mcp/salt-formulas/armband/qemu_efi.sls | 2 +
+ mcp/salt-formulas/armband/vgabios.sls | 7 ++
+ 9 files changed, 168 insertions(+)
create mode 100644 mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
create mode 100644 mcp/salt-formulas/armband/init.sls
create mode 100644 mcp/salt-formulas/armband/nova_config.sls
@@ -82,10 +82,10 @@ index c391cfe6..02a813c9 100755
salt -C 'kvm* or cmp*' state.apply salt
diff --git a/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff b/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
new file mode 100644
-index 00000000..36ddf72b
+index 00000000..4cc118a4
--- /dev/null
+++ b/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
-@@ -0,0 +1,76 @@
+@@ -0,0 +1,106 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Thu, 24 Aug 2017 10:57:28 +0200
+Subject: [PATCH] libvirt: AArch64: ACPI depends on AAVMF
@@ -162,6 +162,36 @@ index 00000000..36ddf72b
+ elif CONF.spice.enabled:
+ video.type = 'qxl'
+ if image_meta.properties.get('hw_video_model'):
++--
++
++From dbd4c20de002784a4ffc07b173e82dd84a3af01c Mon Sep 17 00:00:00 2001
++From: Charalampos Kominos <Charalampos.Kominos@enea.com>
++Date: Wed, 2 May 2018 14:20:47 +0200
++Subject: [PATCH] Allow libvirt to honor root device naming
++
++Current behaviour in upstream nova is for rootfs to be in /dev/vda
++which is the default behaviour when using virtio driver. However when
++other devices are requested either by glance or by CLI, nova ignores
++that naming and still tries to attach to vda which fails.
++
++Manually applied in https://review.openstack.org/#/c/214314/
++
++JIRA: ARMBAND-376
++
++Signed-off-by: Charalampos Kominos <charalampos.kominos@enea.com>
++---
++
++--- a/nova/virt/libvirt/driver.py
+++++ b/nova/virt/libvirt/driver.py
++@@ -8257,6 +8257,8 @@
++ "Ignoring supplied device name: %(device_name)s. "
++ "Libvirt can't honour user-supplied dev names",
++ {'device_name': bdm.device_name}, instance=instance)
+++ if instance.root_device_name == bdm.device_name:
+++ instance.root_device_name = None
++ bdm.device_name = None
++ block_device_info = driver.get_block_device_info(instance,
++ block_device_mapping)
diff --git a/mcp/salt-formulas/armband/init.sls b/mcp/salt-formulas/armband/init.sls
new file mode 100644
index 00000000..8a8cf2ab
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 b7c1bec0..1266a768 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
@@ -16,10 +16,10 @@ the updated kernel & other packages from the start.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- ...-Add-curtin_userdata_arm64_generic_xenial.patch | 35 +++++++++++++++++++++
- mcp/patches/patches.list | 1 +
- .../cluster/mcp-pike-common-ha/infra/maas.yml | 36 ++++++++++++++++++++++
- .../files/curtin_userdata_arm64_generic_xenial | 35 +++++++++++++++++++++
+ ...curtin_userdata_arm64_generic_xenial.patch | 35 ++++++++++++++++++
+ mcp/patches/patches.list | 1 +
+ .../cluster/mcp-pike-common-ha/infra/maas.yml | 36 +++++++++++++++++++
+ .../curtin_userdata_arm64_generic_xenial | 35 ++++++++++++++++++
4 files changed, 107 insertions(+)
create mode 100644 mcp/patches/0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
create mode 100644 mcp/salt-formulas/maas/files/curtin_userdata_arm64_generic_xenial
diff --git a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
index 37fb9dd4..07c447be 100644
--- a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
@@ -33,9 +33,9 @@ to pick up the changes, so we'll run it before rebooting kvm nodes.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- mcp/config/states/baremetal_init | 1 +
- .../armband/files/salt-minion-aarch64-rollup.diff | 101 +++++++++++++++++++++
- mcp/salt-formulas/armband/salt_minion.sls | 7 ++
+ mcp/config/states/baremetal_init | 1 +
+ .../files/salt-minion-aarch64-rollup.diff | 101 ++++++++++++++++++
+ mcp/salt-formulas/armband/salt_minion.sls | 7 ++
3 files changed, 109 insertions(+)
create mode 100644 mcp/salt-formulas/armband/files/salt-minion-aarch64-rollup.diff
create mode 100644 mcp/salt-formulas/armband/salt_minion.sls
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 bb8a947b..986db52a 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
@@ -23,11 +23,11 @@ specific values.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- .../0103-virtng-module-Extend-libvirt_domain.patch | 54 ++++++++++++++++++++++
- ...4-salt-control-virt-Extend-libvirt_domain.patch | 51 ++++++++++++++++++++
- mcp/patches/patches.list | 2 +
- .../cluster/mcp-pike-common-ha/infra/kvm.yml | 15 ++++++
- .../cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 | 3 ++
+ ...-virtng-module-Extend-libvirt_domain.patch | 54 +++++++++++++++++++
+ ...t-control-virt-Extend-libvirt_domain.patch | 51 ++++++++++++++++++
+ mcp/patches/patches.list | 2 +
+ .../cluster/mcp-pike-common-ha/infra/kvm.yml | 15 ++++++
+ .../cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 | 3 ++
5 files changed, 125 insertions(+)
create mode 100644 mcp/patches/0103-virtng-module-Extend-libvirt_domain.patch
create mode 100644 mcp/patches/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 48c05725..5c3b1fb1 100644
--- a/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch
+++ b/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch
@@ -15,8 +15,8 @@ salt custom py module seedng.py should use custom repo arg
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- .../0105-seedng-module-Add-AArch64-repo.patch | 22 ++++++++++++++++++++++
- mcp/patches/patches.list | 1 +
+ .../0105-seedng-module-Add-AArch64-repo.patch | 22 +++++++++++++++++++
+ mcp/patches/patches.list | 1 +
2 files changed, 23 insertions(+)
create mode 100644 mcp/patches/0105-seedng-module-Add-AArch64-repo.patch
diff --git a/patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch
new file mode 100644
index 00000000..5febf93c
--- /dev/null
+++ b/patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch
@@ -0,0 +1,44 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2018 Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+From: Charalampos Kominos <Charalampos.Kominos@enea.com>
+Date: Fri, 27 Apr 2018 14:54:22 +0200
+Subject: [PATCH] Set volume name in source file to sdX
+
+Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
+---
+ .../classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 | 2 +-
+ .../classes/cluster/mcp-pike-common-noha/openstack_control.yml | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
+index 6f7b33e3..dfc212e2 100644
+--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
++++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
+@@ -139,7 +139,7 @@ parameters:
+ server:
+ cacert: /etc/ssl/certs/mcp_os_cacert
+ openrc_extra:
+- volume_device_name: vdc
++ volume_device_name: sdc
+ bind:
+ server:
+ control:
+diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
+index 01b32097..1b970412 100644
+--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
++++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
+@@ -57,7 +57,7 @@ parameters:
+ server:
+ admin_email: ${_param:admin_email}
+ openrc_extra:
+- volume_device_name: vdc
++ volume_device_name: sdc
+ glance:
+ server:
+ storage: