diff options
Diffstat (limited to 'patches/opnfv-fuel')
3 files changed, 112 insertions, 54 deletions
diff --git a/patches/opnfv-fuel/arm64-bug-fixes/0002-bootstrap-Pin-kernel-to-4.4.0-45.patch b/patches/opnfv-fuel/arm64-bug-fixes/0002-bootstrap-Pin-kernel-to-4.4.0-45.patch deleted file mode 100644 index b75c1ffa..00000000 --- a/patches/opnfv-fuel/arm64-bug-fixes/0002-bootstrap-Pin-kernel-to-4.4.0-45.patch +++ /dev/null @@ -1,39 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 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: Tue, 14 Mar 2017 19:56:50 +0100 -Subject: [PATCH] bootstrap: Pin kernel to 4.4.0-45 - -JIRA: https://jira.opnfv.org/browse/ARMBAND-239 - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml -index ff5baa8..794cca8 100644 ---- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml -+++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml -@@ -13,13 +13,13 @@ - extra_dirs: - - /usr/share/fuel_bootstrap_cli/files/xenial - output_dir: /tmp/ -- kernel_flavor: linux-image-generic-lts-xenial -+ kernel_flavor: linux-image-4.4.0-45-generic - packages: - - daemonize - - fuel-agent - - hwloc - - i40e-dkms - - linux-firmware -+ - linux-headers-4.4.0-45-generic -- - linux-headers-generic - - live-boot - - live-boot-initramfs-tools diff --git a/patches/opnfv-fuel/arm64-bug-fixes/0002-bootstrap-dea_base-Pin-kernel-to-4.8.0-9944.patch b/patches/opnfv-fuel/arm64-bug-fixes/0002-bootstrap-dea_base-Pin-kernel-to-4.8.0-9944.patch new file mode 100644 index 00000000..b0269419 --- /dev/null +++ b/patches/opnfv-fuel/arm64-bug-fixes/0002-bootstrap-dea_base-Pin-kernel-to-4.8.0-9944.patch @@ -0,0 +1,79 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2017 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: Tue, 14 Mar 2017 19:56:50 +0100 +Subject: [PATCH] bootstrap, dea_base: Pin kernel to 4.8.0-9944 + +Since newer kernels have issues with AAVMF + vhost_net, +we need to also temporarily blacklist vhost_net. + +TODO: Remove vhost_net blacklist (later). + +JIRA: https://jira.opnfv.org/browse/ARMBAND-161 +JIRA: https://jira.opnfv.org/browse/ARMBAND-171 +JIRA: https://jira.opnfv.org/browse/ARMBAND-227 +JIRA: https://jira.opnfv.org/browse/ARMBAND-230 +JIRA: https://jira.opnfv.org/browse/ARMBAND-239 +JIRA: https://jira.opnfv.org/browse/ARMBAND-244 + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml | 5 +++-- + deploy/config/dea_base.yaml | 8 ++++++-- + 2 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml +index ff5baa8..42765b6 100644 +--- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml ++++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml +@@ -13,14 +13,15 @@ + extra_dirs: + - /usr/share/fuel_bootstrap_cli/files/xenial + output_dir: /tmp/ +- kernel_flavor: linux-image-generic-lts-xenial ++ kernel_flavor: linux-image-4.8.0-9944-generic + packages: + - daemonize + - fuel-agent + - hwloc + - i40e-dkms + - linux-firmware +- - linux-headers-generic ++ - linux-image-extra-4.8.0-9944-generic ++ - linux-headers-4.8.0-9944-generic + - live-boot + - live-boot-initramfs-tools + - lshw +diff --git a/deploy/config/dea_base.yaml b/deploy/config/dea_base.yaml +index 386686f..2a5928e 100644 +--- a/deploy/config/dea_base.yaml ++++ b/deploy/config/dea_base.yaml +@@ -534,6 +534,8 @@ settings: + + anacron + ++ armband-vhost-net-blacklist ++ + bash-completion + + bridge-utils +@@ -560,9 +562,11 @@ settings: + + linux-firmware + +- linux-headers-generic-lts-xenial ++ linux-image-4.8.0-9944-generic ++ ++ linux-image-extra-4.8.0-9944-generic + +- linux-image-generic-lts-xenial ++ linux-headers-4.8.0-9944-generic + + lvm2 + diff --git a/patches/opnfv-fuel/upstream-backports/0005-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch b/patches/opnfv-fuel/upstream-backports/0005-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch index 1bc07bbf..10a7f2c3 100644 --- a/patches/opnfv-fuel/upstream-backports/0005-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch +++ b/patches/opnfv-fuel/upstream-backports/0005-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch @@ -27,10 +27,11 @@ TODO: implement sanity checks for bootstrap and target images; TODO: switch `exec_cmd('mkdir ...')` to `create_dir_if_not_exists`; JIRA: ARMBAND-172 +JIRA: ARMBAND-242 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - ...p_admin_node.sh-deploy_cache-install-hook.patch | 73 +++++ + ...p_admin_node.sh-deploy_cache-install-hook.patch | 90 ++++++ ci/deploy.sh | 14 +- deploy/cloud/configure_settings.py | 4 + deploy/cloud/deployment.py | 12 + @@ -38,16 +39,16 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> deploy/deploy_cache.py | 312 +++++++++++++++++++++ deploy/deploy_env.py | 13 +- deploy/install_fuel_master.py | 9 +- - 8 files changed, 453 insertions(+), 9 deletions(-) + 8 files changed, 470 insertions(+), 9 deletions(-) create mode 100644 build/f_repos/patch/fuel-main/0006-bootstrap_admin_node.sh-deploy_cache-install-hook.patch create mode 100644 deploy/deploy_cache.py diff --git a/build/f_repos/patch/fuel-main/0006-bootstrap_admin_node.sh-deploy_cache-install-hook.patch b/build/f_repos/patch/fuel-main/0006-bootstrap_admin_node.sh-deploy_cache-install-hook.patch new file mode 100644 -index 0000000..69a4c22 +index 0000000..7acb746 --- /dev/null +++ b/build/f_repos/patch/fuel-main/0006-bootstrap_admin_node.sh-deploy_cache-install-hook.patch -@@ -0,0 +1,73 @@ +@@ -0,0 +1,90 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Mon, 28 Nov 2016 14:27:48 +0100 +Subject: [PATCH] bootstrap_admin_node.sh: deploy_cache install hook @@ -60,18 +61,24 @@ index 0000000..69a4c22 +`build` when a bootstrap tar is available in the agreed location, +/var/lib/opnfv/cache/bootstraps/. + ++Temporary until Fuel@Openstack fixes Master key propagation to nodes' ++authorized_keys, use Mcollective remote shell execute to add it ++during deployment. ++This might duplicate the entry in authorized_keys during re-deploys. ++ +JIRA: ARMBAND-172 ++JIRA: ARMBAND-242 + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- -+ iso/bootstrap_admin_node.sh | 20 +++++++++++++++++++- -+ 1 file changed, 19 insertions(+), 1 deletion(-) ++ iso/bootstrap_admin_node.sh | 35 ++++++++++++++++++++++++++++++++++- ++ 1 file changed, 34 insertions(+), 1 deletion(-) + +diff --git a/iso/bootstrap_admin_node.sh b/iso/bootstrap_admin_node.sh -+index abc5ffb..15e6261 100755 ++index 4f5ce4e..4c79552 100755 +--- a/iso/bootstrap_admin_node.sh ++++ b/iso/bootstrap_admin_node.sh -+@@ -61,6 +61,8 @@ wget \ ++@@ -64,6 +64,8 @@ wget \ + ASTUTE_YAML='/etc/fuel/astute.yaml' + BOOTSTRAP_NODE_CONFIG="/etc/fuel/bootstrap_admin_node.conf" + CUSTOM_REPOS="/root/default_deb_repos.yaml" @@ -80,7 +87,7 @@ index 0000000..69a4c22 + bs_build_log='/var/log/fuel-bootstrap-image-build.log' + bs_status=0 + # Backup network configs to this folder. Folder will be created only if -+@@ -94,6 +96,7 @@ image becomes available, reboot nodes that failed to be discovered." ++@@ -97,6 +99,7 @@ image becomes available, reboot nodes that failed to be discovered." + bs_done_message="Default bootstrap image building done. Now you can boot new \ + nodes over PXE, they will be discovered and become available for installing \ + OpenStack on them" @@ -88,10 +95,20 @@ index 0000000..69a4c22 + # Update issues messages + update_warn_message="There is an issue connecting to update repository of \ + your distributions of OpenStack. \ -+@@ -500,12 +503,31 @@ set_ui_bootstrap_error () { ++@@ -509,12 +512,42 @@ set_ui_bootstrap_error () { + EOF + } + +++function inject_cached_ssh_key () { +++ # FIXME(armband): Propagate master ssh key to nodes' +++ # authorized_keys, until upstream fixes this for image build. +++ local moddir="/etc/puppet/${OPENSTACK_VERSION}/modules/osnailyfacter/modular" +++ cat >> "${moddir}/astute/generate_keys.sh" <<-EOF +++ mco rpc execute_shell_command execute \\ +++ cmd="echo $(cat /root/.ssh/id_rsa.pub) >> /root/.ssh/authorized_keys" +++ EOF +++} +++ ++function inject_cached_ubuntu_bootstrap () { ++ if [ -f "${OPNFV_CACHE_PATH}/${OPNFV_CACHE_TAR}" -a \ ++ -f "${OPNFV_CACHE_PATH}/id_rsa.pub" -a \ @@ -103,6 +120,7 @@ index 0000000..69a4c22 ++ /etc/nailgun/settings.yaml && \ ++ fuel-bootstrap -v --debug import --activate \ ++ "${OPNFV_CACHE_PATH}/${OPNFV_CACHE_TAR}" >>"$bs_build_log" 2>&1; then +++ inject_cached_ssh_key ++ fuel notify --topic "done" --send "${bs_cache_message}" ++ return 0 ++ fi @@ -203,7 +221,7 @@ index b60a60f..4e007e1 100644 with io.open(settings_yaml, 'w') as stream: yaml.dump(settings, stream, default_flow_style=False) diff --git a/deploy/cloud/deployment.py b/deploy/cloud/deployment.py -index 28bcfdf..b0bfdcc 100644 +index 4329a4c..a84d46c 100644 --- a/deploy/cloud/deployment.py +++ b/deploy/cloud/deployment.py @@ -19,6 +19,8 @@ from common import ( @@ -215,7 +233,7 @@ index 28bcfdf..b0bfdcc 100644 SEARCH_TEXT = '(err)' LOG_FILE = '/var/log/puppet.log' GREP_LINES_OF_LEADING_CONTEXT = 100 -@@ -47,6 +49,14 @@ class Deployment(object): +@@ -51,6 +53,14 @@ class Deployment(object): self.pattern = re.compile( '\d\d\d\d-\d\d-\d\d\s\d\d:\d\d:\d\d') @@ -230,7 +248,7 @@ index 28bcfdf..b0bfdcc 100644 def collect_error_logs(self): for node_id, roles_blade in self.node_id_roles_dict.iteritems(): log_list = [] -@@ -108,6 +118,7 @@ class Deployment(object): +@@ -112,6 +122,7 @@ class Deployment(object): start = time.time() log('Starting deployment of environment %s' % self.env_id) @@ -238,7 +256,7 @@ index 28bcfdf..b0bfdcc 100644 deploy_id = None ready = False timeout = False -@@ -140,6 +151,7 @@ class Deployment(object): +@@ -144,6 +155,7 @@ class Deployment(object): err('Deployment timed out, environment %s is not operational, ' 'snapshot will not be performed' % self.env_id) @@ -671,7 +689,7 @@ index 0000000..7df43c6 + log('Failed to install targetimages for env %s: %s' % + (str(env_id), str(ex))) diff --git a/deploy/deploy_env.py b/deploy/deploy_env.py -index 8afaeb1..318345d 100644 +index d374cce..445070a 100644 --- a/deploy/deploy_env.py +++ b/deploy/deploy_env.py @@ -15,6 +15,7 @@ import glob |