From 1bd3cdf194b12350026dc9678e6e0187236c4379 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 7 May 2018 19:57:05 +0200 Subject: p/fuel: Retire Armband repos in favor of MCP ones JIRA: ARMBAND-372 Change-Id: I53eaa1d48da72588b1cd9e067504dd8cccc54cd6 Signed-off-by: Alexandru Avadanii --- ...al-Add-Armband-Openstack-repos-to-kvm-cmp.patch | 4 ++-- ...-salt-formulas-Add-enable-armband-formula.patch | 20 ++++++++--------- ...-Add-curtin_userdata_arm64_generic_xenial.patch | 8 +++---- ...lt-formulas-armband-Extend-libvirt_domain.patch | 6 +++--- ...-virtng.py-virt.sls-Extend-libvirt_domain.patch | 10 ++++----- .../0009-seedng-module-Add-AArch64-repo.patch | 4 ++-- ...012-Set-volume-name-in-source-file-to-sdX.patch | 4 ++-- ...1-linux.system.repo.mcp-Add-Armband-repos.patch | 25 ---------------------- 8 files changed, 28 insertions(+), 53 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 ae0c4d11..ecbe3a5b 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 --- - mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml | 1 + - .../classes/cluster/mcp-pike-common-ha/openstack_compute.yml | 1 + + mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml | 1 + + mcp/reclass/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 64115f87..122a72cd 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,15 +26,15 @@ Signed-off-by: Guillermo Herrero Signed-off-by: Charalampos Kominos Signed-off-by: Alexandru Avadanii --- - 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 ++ + 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 | 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 @@ -82,7 +82,7 @@ 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..4cc118a4 +index 00000000..c987a4ce --- /dev/null +++ b/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff @@ -0,0 +1,106 @@ 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 1266a768..b7c1bec0 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 --- - ...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 ++++++++++++++++++ + ...-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 +++++++++++++++++++++ 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 07c447be..37fb9dd4 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 --- - mcp/config/states/baremetal_init | 1 + - .../files/salt-minion-aarch64-rollup.diff | 101 ++++++++++++++++++ - mcp/salt-formulas/armband/salt_minion.sls | 7 ++ + mcp/config/states/baremetal_init | 1 + + .../armband/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 986db52a..bb8a947b 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 --- - ...-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 ++ + .../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 ++ 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 5c3b1fb1..48c05725 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 --- - .../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 index 5febf93c..503c6ab1 100644 --- 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 @@ -12,8 +12,8 @@ Subject: [PATCH] Set volume name in source file to sdX Signed-off-by: Charalampos Kominos --- - .../classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 | 2 +- - .../classes/cluster/mcp-pike-common-noha/openstack_control.yml | 2 +- + mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 | 2 +- + mcp/reclass/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 diff --git a/patches/reclass-system-salt-model/0001-linux.system.repo.mcp-Add-Armband-repos.patch b/patches/reclass-system-salt-model/0001-linux.system.repo.mcp-Add-Armband-repos.patch index b4f76557..f1b7824b 100644 --- a/patches/reclass-system-salt-model/0001-linux.system.repo.mcp-Add-Armband-repos.patch +++ b/patches/reclass-system-salt-model/0001-linux.system.repo.mcp-Add-Armband-repos.patch @@ -54,28 +54,3 @@ index 9839a23..ad9b5ce 100644 + - pin: 'release a=nightly' + priority: 1100 + package: '*' -diff --git a/linux/system/repo/mcp/openstack.yml b/linux/system/repo/mcp/openstack.yml -index 465b75d..22defb7 100644 ---- a/linux/system/repo/mcp/openstack.yml -+++ b/linux/system/repo/mcp/openstack.yml -@@ -21,3 +21,20 @@ parameters: - - pin: 'release l=${_param:linux_system_repo_mk_openstack_version}' - priority: 1100 - package: '*' -+ armband_openstack: -+ source: "deb http://linux.enea.com/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version} main" -+ architectures: arm64 -+ key_url: "https://linux.enea.com/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename}/archive-mcp${_param:openstack_version}.key" -+ pin: -+ - pin: 'release l=${_param:openstack_version}' -+ priority: 1100 -+ package: '*' -+ # Armband only provides apt_mk_version=nightly for now -+ armband_mk_openstack: -+ source: "deb [arch=arm64] http://linux.enea.com/apt-mk/${_param:linux_system_codename}/ nightly ${_param:openstack_version}" -+ architectures: arm64 -+ key_url: "https://linux.enea.com/apt-mk/public.gpg" -+ pin: -+ - pin: 'release l=nightly' -+ priority: 1100 -+ package: '*' -- cgit 1.2.3-korg