aboutsummaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
Diffstat (limited to 'patches')
-rw-r--r--patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch6
-rw-r--r--patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch4
-rw-r--r--patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch8
-rw-r--r--patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch4
-rw-r--r--patches/opnfv-fuel/0010-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch31
-rw-r--r--patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch2
-rw-r--r--patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch2
-rw-r--r--patches/opnfv-fuel/0013-Revert-Get-back-to-the-GA-kernel.patch14
-rw-r--r--patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-openstack-repo.patch40
9 files changed, 89 insertions, 22 deletions
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 c1f1b03e..0f15f447 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
@@ -56,10 +56,10 @@ index 4f3760f6..115a56c1 100755
salt -C 'I@mongodb:server and *01*' state.sls mongodb || true
wait_for 10 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'"
diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
-index 9fc30bbf..998fc6b4 100755
+index 4c8cbcf8..1cf54240 100755
--- a/mcp/config/states/openstack_noha
+++ b/mcp/config/states/openstack_noha
-@@ -52,6 +52,8 @@ salt -I 'ceilometer:agent' state.sls ceilometer
+@@ -53,6 +53,8 @@ salt -I 'ceilometer:agent' state.sls ceilometer
salt -I 'horizon:server' state.sls horizon
@@ -69,7 +69,7 @@ index 9fc30bbf..998fc6b4 100755
salt -I 'horizon:server' file.symlink \
/var/lib/openstack-dashboard/static \
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 80c0c87e..144245f9 100755
+index c391cfe6..02a813c9 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -27,6 +27,7 @@ if [ "${ERASE_ENV}" -eq 1 ]; then
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 40dce3bc..fb98d47c 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,10 +66,10 @@ index 00000000..0368937d
+ file.managed:
+ - source: salt://maas/files/pgpass
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index e0ad1f70..59b617dd 100644
+index b650ec87..4d19dfe7 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -16,3 +16,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: 0015-Set-ovs-bridges-as-L3-interfaces.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 4e2d522b..cd3f8db7 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,10 +150,10 @@ index 00000000..78eb0bff
+
+ #salt_control_seed_{{ cluster_name }}_{{ node_name }}:
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 59b617dd..520a2756 100644
+index 4d19dfe7..cd7a1d5a 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -17,3 +17,5 @@
+@@ -18,3 +18,5 @@
/usr/share/salt-formulas/env: 0012-routes-Skip-network-restart-on-noifupdown.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
@@ -208,13 +208,13 @@ index 5bbe0fe4..84b392e6 100644
net_profile: default_ext
cluster:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2
-index 81135d6a..36908b18 100644
+index 5fc4776d..b19789e3 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2
@@ -19,6 +19,9 @@ parameters:
opendaylight.server:
cpu: 4
- ram: 6144
+ ram: 8192
+ hw_firmware_type: uefi
+ virt_machine_model: virt
+ cpu_model: host-passthrough
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 b9800d78..092bf241 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 00000000..d40e63b2
+ 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 520a2756..f7d25d3b 100644
+index cd7a1d5a..e7fa2958 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -19,3 +19,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/patches/opnfv-fuel/0010-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch b/patches/opnfv-fuel/0010-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
index 3461bb21..cc41beb6 100644
--- a/patches/opnfv-fuel/0010-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
+++ b/patches/opnfv-fuel/0010-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
@@ -10,20 +10,28 @@ From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Wed, 30 Aug 2017 22:15:07 +0200
Subject: [PATCH] baremetal, virtual: Extend arch list for UCA repo
+While at it, handle pike-staging PPA too.
+
JIRA: https://jira.opnfv.org/browse/ARMBAND-304
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 | 2 +-
- mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 | 4 ++--
+ mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2
-index 3b890da0..5b9d24e7 100644
+index 9db8f35d..026096b9 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2
-@@ -251,7 +251,7 @@ parameters:
+@@ -251,12 +251,12 @@ parameters:
repo:
+ uca-staging:
+ source: "deb http://ppa.launchpad.net/ubuntu-cloud-archive/${_param:openstack_version}-staging/ubuntu xenial main"
+- architectures: amd64
++ architectures: amd64,arm64
+ key_id: 9F68104E
+ key_server: keyserver.ubuntu.com
uca:
source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main"
- architectures: amd64
@@ -32,11 +40,18 @@ index 3b890da0..5b9d24e7 100644
key_server: keyserver.ubuntu.com
kernel:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml
-index 46d7af4a..076f38a9 100644
+index cef0b531..c3642b50 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml
-@@ -96,7 +96,7 @@ parameters:
- repo:
+@@ -97,13 +97,13 @@ parameters:
+ uca-staging:
+ # yamllint disable rule:line-length
+ source: "deb http://ppa.launchpad.net/ubuntu-cloud-archive/${_param:openstack_version}-staging/ubuntu xenial main"
+- architectures: amd64
++ architectures: amd64,arm64
+ key_id: 9F68104E
+ key_server: keyserver.ubuntu.com
+ # yamllint enable rule:line-length
uca:
source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main"
- architectures: amd64
diff --git a/patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch
index d9577cdd..083cf37d 100644
--- a/patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch
+++ b/patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch
@@ -34,7 +34,7 @@ index 0c41557d..799a9419 100755
salt -C 'kvm* or cmp*' state.apply salt.minion
salt -C 'cmp*' state.apply linux.system
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 144245f9..8ea75f17 100755
+index 02a813c9..a179b22c 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -39,6 +39,7 @@ vcp_nodes=$(salt --out yaml 'kvm01*' pillar.get salt:control:cluster:internal:no
diff --git a/patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch b/patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch
index 4c74200d..7e6517b1 100644
--- a/patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch
+++ b/patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch
@@ -47,7 +47,7 @@ index 5c08d6d2..e6e5ebf3 100644
client:
volumes:
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 c487e342..62c1ab28 100644
+index 6f7b33e3..795c0383 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
@@ -66,7 +66,7 @@ parameters:
diff --git a/patches/opnfv-fuel/0013-Revert-Get-back-to-the-GA-kernel.patch b/patches/opnfv-fuel/0013-Revert-Get-back-to-the-GA-kernel.patch
index 28388d41..3432e857 100644
--- a/patches/opnfv-fuel/0013-Revert-Get-back-to-the-GA-kernel.patch
+++ b/patches/opnfv-fuel/0013-Revert-Get-back-to-the-GA-kernel.patch
@@ -10,10 +10,12 @@ From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Mon, 22 Jan 2018 19:41:37 +0100
Subject: [PATCH] Revert "Get back to the GA kernel"
+This partially reverts commit b3b4b2e1bcd42f4628e53796c3dab81151f56bc2
This reverts commit d06bcfb72c44b507c3efee4de00f415869f48450.
---
mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
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 226a4f66..a2987423 100644
@@ -28,3 +30,13 @@ index 226a4f66..a2987423 100644
maas:
region:
salt_master_ip: ${_param:reclass_config_master}
+diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml
+index 6662f1fa..be18e212 100644
+--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml
++++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml
+@@ -11,4 +11,4 @@ classes:
+ - cluster.mcp-pike-odl-ha.infra
+ parameters:
+ _param:
+- hwe_kernel: 'ga-16.04'
++ hwe_kernel: 'hwe-16.04-edge'
diff --git a/patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-openstack-repo.patch b/patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-openstack-repo.patch
new file mode 100644
index 00000000..9fd02fa1
--- /dev/null
+++ b/patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-openstack-repo.patch
@@ -0,0 +1,40 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: 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: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Wed, 4 Apr 2018 20:08:55 +0200
+Subject: [PATCH] linux.system.repo: Drop arch for openstack repo
+
+Now that mcp-repos mirror has arm64 packages too, we can either extend
+the current architecture list or just drop it and let APT figure it
+out.
+
+Extending the arch list to 'amd64,arm64' would lead to doubling repo
+metadata downloads on all archs, while dropping it will allow APT to
+only download the repo metadata for the current system arch.
+
+To keep old behavior for amd64 and prevent multiple downloads, let's
+just drop the 'architectures' field.
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ linux/system/repo/mcp/openstack.yml | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/linux/system/repo/mcp/openstack.yml b/linux/system/repo/mcp/openstack.yml
+index 22defb75..302c7cb3 100644
+--- a/linux/system/repo/mcp/openstack.yml
++++ b/linux/system/repo/mcp/openstack.yml
+@@ -7,7 +7,6 @@ parameters:
+ repo:
+ mirantis_openstack:
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version} main"
+- architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename}/archive-mcp${_param:openstack_version}.key"
+ pin:
+ - pin: 'release l=${_param:openstack_version}'