From be1d365ef5638e77a009df0dda703c7d0011d254 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Mon, 9 Oct 2017 22:28:16 -0500 Subject: [PATCH] allow a default kernel to be set Change-Id: I6cf0cf918df6c79757b283333f5a687ff20a46bd --- multi-node-aio/README.rst | 2 ++ multi-node-aio/build.sh | 1 + multi-node-aio/playbooks/group_vars/all.yml | 1 + multi-node-aio/playbooks/pxe/debian/compute.preseed.j2 | 4 ++++ multi-node-aio/playbooks/pxe/debian/mnaio.preseed.j2 | 4 ++++ multi-node-aio/playbooks/pxe/debian/vm-compute.preseed.j2 | 4 ++++ multi-node-aio/playbooks/pxe/debian/vm.preseed.j2 | 4 ++++ 7 files changed, 20 insertions(+) diff --git a/multi-node-aio/README.rst b/multi-node-aio/README.rst index 12b2beb1..3709e8fc 100644 --- a/multi-node-aio/README.rst +++ b/multi-node-aio/README.rst @@ -122,6 +122,8 @@ Instruct the system to Kick all of the VMs: Instruct the VM to use the selected image, eg. ubuntu-16.04-amd64: ``DEFAULT_IMAGE=${DEFAULT_IMAGE:-ubuntu-16.04-amd64}`` +Instruct the VM to use the selected kernel meta package, eg. linux-generic: + ``DEFAULT_KERNEL=${DEFAULT_KERNEL:-linux-generic}`` Set the OSA branch for this script to deploy: ``OSA_BRANCH=${OSA_BRANCH:-master}`` diff --git a/multi-node-aio/build.sh b/multi-node-aio/build.sh index 831deff2..d1231ef3 100755 --- a/multi-node-aio/build.sh +++ b/multi-node-aio/build.sh @@ -40,5 +40,6 @@ ansible-playbook -vv \ -e pre_config_osa=${PRE_CONFIG_OSA:-"true"} \ -e configure_openstack=${CONFIGURE_OPENSTACK:-"true"} \ -e config_prerouting=${CONFIG_PREROUTING:-"false"} \ + -e default_ubuntu_kernel=${DEFAULT_KERNEL:-"linux-generic"} \ --force-handlers \ playbooks/site.yml diff --git a/multi-node-aio/playbooks/group_vars/all.yml b/multi-node-aio/playbooks/group_vars/all.yml index d5b72548..793fa061 100644 --- a/multi-node-aio/playbooks/group_vars/all.yml +++ b/multi-node-aio/playbooks/group_vars/all.yml @@ -19,6 +19,7 @@ default_os_families: ubuntu-16.04-amd64: debian ubuntu-14.04-amd64: debian +default_ubuntu_kernel: linux-generic default_ubuntu_mirror_proxy: 'http://10.0.2.1:3142/' default_ubuntu_mirror_hostname: archive.ubuntu.com default_ubuntu_mirror_directory: /ubuntu diff --git a/multi-node-aio/playbooks/pxe/debian/compute.preseed.j2 b/multi-node-aio/playbooks/pxe/debian/compute.preseed.j2 index ab9c8f84..e7775a69 100644 --- a/multi-node-aio/playbooks/pxe/debian/compute.preseed.j2 +++ b/multi-node-aio/playbooks/pxe/debian/compute.preseed.j2 @@ -39,6 +39,10 @@ d-i preseed/early_command string \ # Required at least for 12.10+ d-i live-installer/net-image string {{ tftp_server }}/images/{{ item.value.image_short_name }}/install/filesystem.squashfs +# The kernel image (meta) package to be installed; "none" can be used if no +# kernel is to be installed. +d-i base-installer/kernel/image string {{ default_ubuntu_kernel }} + # Localization d-i debian-installer/locale string en diff --git a/multi-node-aio/playbooks/pxe/debian/mnaio.preseed.j2 b/multi-node-aio/playbooks/pxe/debian/mnaio.preseed.j2 index 19855b54..27c8114e 100644 --- a/multi-node-aio/playbooks/pxe/debian/mnaio.preseed.j2 +++ b/multi-node-aio/playbooks/pxe/debian/mnaio.preseed.j2 @@ -39,6 +39,10 @@ d-i preseed/early_command string \ # Required at least for 12.10+ d-i live-installer/net-image string {{ tftp_server }}/images/{{ item.value.image_short_name }}/install/filesystem.squashfs +# The kernel image (meta) package to be installed; "none" can be used if no +# kernel is to be installed. +d-i base-installer/kernel/image string {{ default_ubuntu_kernel }} + # Localization d-i debian-installer/locale string en diff --git a/multi-node-aio/playbooks/pxe/debian/vm-compute.preseed.j2 b/multi-node-aio/playbooks/pxe/debian/vm-compute.preseed.j2 index 7b80c6bc..125590a9 100644 --- a/multi-node-aio/playbooks/pxe/debian/vm-compute.preseed.j2 +++ b/multi-node-aio/playbooks/pxe/debian/vm-compute.preseed.j2 @@ -39,6 +39,10 @@ d-i preseed/early_command string \ # Required at least for 12.10+ d-i live-installer/net-image string {{ tftp_server }}/images/{{ item.value.image_short_name }}/install/filesystem.squashfs +# The kernel image (meta) package to be installed; "none" can be used if no +# kernel is to be installed. +d-i base-installer/kernel/image string {{ default_ubuntu_kernel }} + # Localization d-i debian-installer/locale string en diff --git a/multi-node-aio/playbooks/pxe/debian/vm.preseed.j2 b/multi-node-aio/playbooks/pxe/debian/vm.preseed.j2 index d8f00949..873cb03b 100644 --- a/multi-node-aio/playbooks/pxe/debian/vm.preseed.j2 +++ b/multi-node-aio/playbooks/pxe/debian/vm.preseed.j2 @@ -39,6 +39,10 @@ d-i preseed/early_command string \ # Required at least for 12.10+ d-i live-installer/net-image string {{ tftp_server }}/images/{{ item.value.image_short_name }}/install/filesystem.squashfs +# The kernel image (meta) package to be installed; "none" can be used if no +# kernel is to be installed. +d-i base-installer/kernel/image string {{ default_ubuntu_kernel }} + # Localization d-i debian-installer/locale string en