From b9af498cb689f2018442461834c6f4013158500a Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 1 Aug 2018 23:04:59 +0200 Subject: p/fuel: Drop obsolete bootstrap-salt.sh workarounds JIRA: ARMBAND-399 [1] https://github.com/saltstack/salt-bootstrap/pull/1251 Change-Id: Id3dccf6ae85e105f5e03eae69028da772954318c Signed-off-by: Alexandru Avadanii --- ...lt-formulas-armband-Extend-libvirt_domain.patch | 43 +++------------------- .../0004-Add-opnfv-user-to-the-deployment.patch | 8 ++-- ...005-Set-volume-name-in-source-file-to-sdX.patch | 4 +- .../0006-Switch-back-to-4.4-based-LTS-kernel.patch | 32 ---------------- 4 files changed, 12 insertions(+), 75 deletions(-) delete mode 100644 patches/opnfv-fuel/0006-Switch-back-to-4.4-based-LTS-kernel.patch (limited to 'patches') diff --git a/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch index 8fb84e14..998a5aba 100644 --- a/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch @@ -33,10 +33,10 @@ 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 ++ - 3 files changed, 109 insertions(+) + mcp/config/states/baremetal_init | 1 + + .../files/salt-minion-aarch64-rollup.diff | 70 +++++++++++++++++++ + mcp/salt-formulas/armband/salt_minion.sls | 7 ++ + 3 files changed, 78 insertions(+) create mode 100644 mcp/salt-formulas/armband/files/salt-minion-aarch64-rollup.diff create mode 100644 mcp/salt-formulas/armband/salt_minion.sls @@ -54,41 +54,10 @@ index 358e1874..14d6a570 100755 diff --git a/mcp/salt-formulas/armband/files/salt-minion-aarch64-rollup.diff b/mcp/salt-formulas/armband/files/salt-minion-aarch64-rollup.diff new file mode 100644 -index 00000000..9e74c240 +index 00000000..1a2e9a3c --- /dev/null +++ b/mcp/salt-formulas/armband/files/salt-minion-aarch64-rollup.diff -@@ -0,0 +1,101 @@ -+From: Alexandru Avadanii -+Date: Sun Aug 20 18:18:53 2017 +0200 -+Subject: [PATCH] cloud.py: Allow AArch64 arch in salt bootstrap -+ -+Recent changes in salt bootstrap script from [1] whitelist a -+fixed pool of known architectures. Add "arm64" to that list on the -+fly, as part of `config.gather_bootstrap_script`. -+ -+NOTE: This change will be leveraged by passing a custom DEB repo to -+the bootstrap script with `-R linux.enea.com/saltstack`. -+ -+[1] http://bootstrap.saltstack.com -+ -+Signed-off-by: Alexandru Avadanii -+--- -+ -+diff --git a/salt/utils/cloud.py b/salt/utils/cloud.py -+--- a/salt/utils/cloud.py -++++ b/salt/utils/cloud.py -+@@ -2772,6 +2772,9 @@ -+ if not script_content: -+ raise ValueError('No content in bootstrap script !') -+ -++ # NOTE(armband): edit bootstrap script on the fly to allow AArch64 -++ script_content = script_content.replace('"amd64")', '"amd64"|"arm64")') -++ -+ # Get the path to the built-in deploy scripts directory -+ builtin_deploy_dir = os.path.join( -+ os.path.dirname(__file__), -+-- -+ +@@ -0,0 +1,70 @@ +From: Alexandru Avadanii +Date: Sun Aug 20 18:18:53 2017 +0200 +Subject: [PATCH] libvirt_domain.jinja: Add AArch64 support diff --git a/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch index b6194695..a3e66370 100644 --- a/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch @@ -46,12 +46,12 @@ index f8ef86b3..40849e66 100755 # Propagate APT proxy config created by curtin on baremetal nodes to VCP VMs diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 -index fb1dcacd..530f85e1 100644 +index 15fbf285..51edd16e 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 -@@ -13,6 +13,9 @@ parameters: - _param: - openstack_version: queens +@@ -15,6 +15,9 @@ parameters: + + banner_company_name: OPNFV + opnfv_user_username: opnfv + opnfv_user_password: $1$5/pIEHT1$XFBhNWW4Q8gYd19hczgPF1 diff --git a/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch index c21efebf..246ebdc9 100644 --- a/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch +++ b/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch @@ -30,10 +30,10 @@ index a7e8fcde..81a8a2af 100644 server: <<: *db_conn_recycle_time diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml -index ed1d0649..e137e2c7 100644 +index 48f99ca5..bcc6695c 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml -@@ -79,7 +79,7 @@ parameters: +@@ -80,7 +80,7 @@ parameters: server: admin_email: ${_param:admin_email} openrc_extra: diff --git a/patches/opnfv-fuel/0006-Switch-back-to-4.4-based-LTS-kernel.patch b/patches/opnfv-fuel/0006-Switch-back-to-4.4-based-LTS-kernel.patch deleted file mode 100644 index 98f7262a..00000000 --- a/patches/opnfv-fuel/0006-Switch-back-to-4.4-based-LTS-kernel.patch +++ /dev/null @@ -1,32 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: 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 -Date: Fri, 17 Aug 2018 17:20:13 +0200 -Subject: [PATCH] Switch back to 4.4-based LTS kernel - -JIRA: ARMBAND-398 - -Change-Id: I329346755348525f00602d7f89af295c141a20d5 -Signed-off-by: Alexandru Avadanii ---- - mcp/config/scenario/defaults.yaml | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/mcp/config/scenario/defaults.yaml b/mcp/config/scenario/defaults.yaml -index f5640f71..b228463c 100644 ---- a/mcp/config/scenario/defaults.yaml -+++ b/mcp/config/scenario/defaults.yaml -@@ -43,7 +43,6 @@ aarch64: - - armband 1201 deb [arch=arm64] http://linux.enea.com/mcp-repos/queens/xenial queens-armband main - pkg: - install: -- - linux-generic-hwe-16.04 - - python-futures - - salt-minion - control: -- cgit 1.2.3-korg