From 89bf768f26c8df7e213c4660a342882d099eeaa6 Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Fri, 5 Jun 2015 13:43:35 -0500 Subject: [PATCH] Deprecate local grub2 element Upstream diskimage-builder has merged a version of the grub2 element, so we don't need this one anymore and it conflicts with the upstream version. Rename it to grub2-deprecated until we can switch to the upstream element. Change-Id: I264d2ecfceed730ccf396e1c7338d4c670a4466a --- elements/{grub2 => grub2-deprecated}/README.rst | 5 ++++- elements/{grub2 => grub2-deprecated}/package-installs.yaml | 0 scripts/instack-build-images | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) rename elements/{grub2 => grub2-deprecated}/README.rst (54%) rename elements/{grub2 => grub2-deprecated}/package-installs.yaml (100%) diff --git a/elements/grub2/README.rst b/elements/grub2-deprecated/README.rst similarity index 54% rename from elements/grub2/README.rst rename to elements/grub2-deprecated/README.rst index 274b87db6..d6090dd37 100644 --- a/elements/grub2/README.rst +++ b/elements/grub2-deprecated/README.rst @@ -1,4 +1,7 @@ -Install grub2 +DEPRECATED: Install grub2 + +Upstream has merged their own grub2 element, so this one will be going away +as soon as all of the dependencies have been updated appropriately. Normally baremetal images have the bootloader removed because they boot from PXE-provided kernels and ramdisks, but localboot support requires grub2 to be diff --git a/elements/grub2/package-installs.yaml b/elements/grub2-deprecated/package-installs.yaml similarity index 100% rename from elements/grub2/package-installs.yaml rename to elements/grub2-deprecated/package-installs.yaml diff --git a/scripts/instack-build-images b/scripts/instack-build-images index 44b8eb7e1..76ddb9d3d 100755 --- a/scripts/instack-build-images +++ b/scripts/instack-build-images @@ -135,7 +135,7 @@ puppet-modules \ hiera \ os-net-config \ stable-interface-names \ -grub2 \ +grub2-deprecated \ -p python-psutil,python-debtcollector \ "