aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools
diff options
context:
space:
mode:
authorjuraj.linkes <juraj.linkes@pantheon.tech>2019-07-23 16:14:21 +0200
committerPeter Mikus <pmikus@cisco.com>2019-07-24 07:40:03 +0000
commit7da0581190efdf16026f84899ba33f33e5240f46 (patch)
tree0a4395cf70fd9d306f6d015bbe9f37acc55c333d /resources/tools
parent3cd17847eb55679afb4343ddff5452ac712ac4cd (diff)
Update initramfs build
Initram image was being built with remote resume config. Remove the config while building to avoid possible 30s delays when booting VMs. Change-Id: I988838290dde3d6fae83676937d86f4f12bdb769 Signed-off-by: juraj.linkes <juraj.linkes@pantheon.tech>
Diffstat (limited to 'resources/tools')
-rw-r--r--resources/tools/testbed-setup/ansible/roles/common/files/initramfs_resume1
-rw-r--r--resources/tools/testbed-setup/ansible/roles/common/tasks/kernel_install.yaml36
2 files changed, 32 insertions, 5 deletions
diff --git a/resources/tools/testbed-setup/ansible/roles/common/files/initramfs_resume b/resources/tools/testbed-setup/ansible/roles/common/files/initramfs_resume
new file mode 100644
index 0000000000..820819823b
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/roles/common/files/initramfs_resume
@@ -0,0 +1 @@
+RESUME=none \ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/roles/common/tasks/kernel_install.yaml b/resources/tools/testbed-setup/ansible/roles/common/tasks/kernel_install.yaml
index c215085d69..9cfa415330 100644
--- a/resources/tools/testbed-setup/ansible/roles/common/tasks/kernel_install.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/common/tasks/kernel_install.yaml
@@ -4,16 +4,29 @@
- name: Backup remote initramfs modules
copy:
src: '/etc/initramfs-tools/modules'
- dest: '/etc/initramfs-tools/modules.bkp'
+ dest: '/tmp/initramfs_modules.bkp'
remote_src: yes
tags: install-kernel-image
-- name: Update initramfs modules
+- name: Update remote initramfs modules
copy:
src: '../files/initramfs_modules'
dest: '/etc/initramfs-tools/modules'
tags: install-kernel-image
+- name: Backup remote initramfs resume config
+ copy:
+ src: '/etc/initramfs-tools/conf.d/resume'
+ dest: '/tmp/initramfs-resume.bkp'
+ remote_src: yes
+ tags: install-kernel-image
+
+- name: Update remote initramfs resume config
+ copy:
+ src: '../files/initramfs_resume'
+ dest: '/etc/initramfs-tools/conf.d/resume'
+ tags: install-kernel-image
+
- name: Create target kernel dir
file:
path: '/opt/boot'
@@ -33,13 +46,26 @@
- name: Restore remote initramfs modules
copy:
- src: '/etc/initramfs-tools/modules.bkp'
+ src: '/tmp/initramfs_modules.bkp'
dest: '/etc/initramfs-tools/modules'
remote_src: yes
tags: install-kernel-image
-- name: Remove backup initramfs modules
+- name: Remove remote backup initramfs modules
+ file:
+ path: '/tmp/initramfs_modules.bkp'
+ state: 'absent'
+ tags: install-kernel-image
+
+- name: Restore remote initramfs resume config
+ copy:
+ src: '/tmp/initramfs-resume.bkp'
+ dest: '/etc/initramfs-tools/conf.d/resume'
+ remote_src: yes
+ tags: install-kernel-image
+
+- name: Remove remote backup initramfs resume config
file:
- path: '/etc/initramfs-tools/modules.bkp'
+ path: '/tmp/initramfs-resume.bkp'
state: 'absent'
tags: install-kernel-image