diff options
Diffstat (limited to 'patches')
14 files changed, 26 insertions, 26 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 37a348ea..3c4420f5 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 @@ -1,5 +1,5 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. +: 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 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 9d7b25b2..55a63019 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 @@ -1,5 +1,5 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. +: 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 diff --git a/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch index 97656b37..e0bc27d6 100644 --- a/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch +++ b/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch @@ -1,5 +1,5 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. +: 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 diff --git a/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch b/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch index 7ceb0a1b..5af328ea 100644 --- a/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch +++ b/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch @@ -1,5 +1,5 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. +: 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 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 ffcb1369..30280b3c 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 @@ -1,5 +1,5 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. +: 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 @@ -66,13 +66,13 @@ index 0000000..0368937 + file.managed: + - source: salt://maas/files/pgpass diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 1b3bfea..c460abb 100644 +index 34d913a..01e3224 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/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch + /usr/share/salt-formulas/env: 0013-dpdk-Support-ovs-bridge-tagging.patch +/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml index da28abf..65e6557 100644 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 e11dbee7..13be763b 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 @@ -1,5 +1,5 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. +: 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 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 3a39eac3..5c005f09 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 @@ -1,5 +1,5 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. +: 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 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 87bebcd8..d28cb61b 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 @@ -1,5 +1,5 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. +: 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 @@ -94,7 +94,7 @@ index 0000000..706b67d + for dev in kwargs['boot_dev'].split(): diff --git a/mcp/patches/0104-salt-control-virt-Extend-libvirt_domain.patch b/mcp/patches/0104-salt-control-virt-Extend-libvirt_domain.patch new file mode 100644 -index 0000000..a9fe11b +index 0000000..78eb0bf --- /dev/null +++ b/mcp/patches/0104-salt-control-virt-Extend-libvirt_domain.patch @@ -0,0 +1,51 @@ @@ -133,9 +133,9 @@ index 0000000..a9fe11b +--- a/salt/control/virt.sls ++++ b/salt/control/virt.sls +@@ -44,6 +44,16 @@ -+ seed: True -+ serial_type: pty -+ console: True ++ {%- if node.img_dest is defined %} ++ img_dest: {{ node.img_dest }} ++ {%- endif %} ++ # FIXME(armband): Move these 3 params to different section ++ {%- if size.hw_firmware_type is defined %} ++ hw_firmware_type: {{ size.hw_firmware_type }} @@ -150,12 +150,12 @@ index 0000000..a9fe11b + + #salt_control_seed_{{ cluster_name }}_{{ node_name }}: diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index c460abb..7bb4321 100644 +index 01e3224..e17a329 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -18,3 +18,5 @@ - /usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch +@@ -19,3 +19,5 @@ /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch + /usr/share/salt-formulas/env: 0013-dpdk-Support-ovs-bridge-tagging.patch /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/0009-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch index 78769cfe..c504ca2f 100644 --- a/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch +++ b/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch @@ -1,5 +1,5 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. +: 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 @@ -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 7bb4321..f533061 100644 +index e17a329..d066305 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -20,3 +20,4 @@ +@@ -21,3 +21,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-aarch64-skip-configuration-of-hugepages.patch b/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch index 183b642c..4aa8d570 100644 --- a/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch +++ b/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch @@ -1,5 +1,5 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. +: 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 diff --git a/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch b/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch index b2d084d1..356cc8ba 100644 --- a/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch +++ b/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch @@ -1,5 +1,5 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. +: 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 diff --git a/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch index 423395ab..67c1e765 100644 --- a/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch @@ -1,5 +1,5 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. +: 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 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 34099545..86f02519 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 @@ -1,5 +1,5 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. +: 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 diff --git a/patches/opnfv-fuel/0014-Revert-Get-back-to-the-GA-kernel.patch b/patches/opnfv-fuel/0014-Revert-Get-back-to-the-GA-kernel.patch index d27e4465..5b205113 100644 --- a/patches/opnfv-fuel/0014-Revert-Get-back-to-the-GA-kernel.patch +++ b/patches/opnfv-fuel/0014-Revert-Get-back-to-the-GA-kernel.patch @@ -1,5 +1,5 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. +: 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 |