Merge "Use package-installs in more elements"

elements/deploy-baremetal/element-deps

@@ -0,0 +1 @@
+package-installs

elements/deploy-baremetal/install.d/51-deploy-baremetal-install-tgt

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -eu
-set -o pipefail
-
-install-packages tgt

elements/deploy-baremetal/install.d/52-deploy-baremetal-install-busybox

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -eu
-set -o pipefail
-
-install-packages busybox

elements/deploy-baremetal/install.d/package-installs-deploy-baremetal

@@ -0,0 +1,2 @@
+busybox
+tgt

elements/deploy-ironic/element-deps

@@ -0,0 +1 @@
+package-installs

elements/deploy-ironic/install.d/51-deploy-ironic-install-tgt

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -eu
-set -o pipefail
-
-install-packages tgt

elements/deploy-ironic/install.d/52-deploy-ironic-install-busybox

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -eu
-set -o pipefail
-
-install-packages busybox

elements/deploy-ironic/install.d/53-install-curl

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -eu
-set -o pipefail
-
-install-packages curl

elements/deploy-ironic/install.d/package-installs-deploy-ironic

@@ -0,0 +1,3 @@
+busybox
+curl
+tgt

elements/deploy-kexec/element-deps

@@ -1 +1,2 @@
 deploy-baremetal
+package-installs

elements/deploy-kexec/install.d/53-install-kexec

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -eu
-set -o pipefail
-
-install-packages kexec-tools

elements/deploy-kexec/install.d/package-installs-deploy-kexec

@@ -0,0 +1 @@
+kexec-tools

elements/dracut-network/element-deps

@@ -1 +1,2 @@
+package-installs
 select-boot-kernel-initrd

elements/dracut-network/install.d/10-install-dracut-network

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -eu
-set -o pipefail
-
-install-packages dracut-network patch

elements/dracut-network/install.d/package-installs-dracut-network

@@ -0,0 +1,2 @@
+dracut-network
+patch

elements/hwdiscovery/element-deps

@@ -0,0 +1 @@
+package-installs

elements/hwdiscovery/install.d/10-hwinfo

@@ -1,8 +0,0 @@
-#!/bin/bash
-# Support for hard ware discovery
-
-set -eu
-set -o pipefail
-set -o xtrace
-
-install-packages hwinfo

elements/hwdiscovery/install.d/package-installs-hwdiscovery

@@ -0,0 +1 @@
+hwinfo

elements/opensuse/element-deps

@@ -1,3 +1,4 @@
 cache-url
 dib-run-parts
+package-installs
 zypper

elements/opensuse/install.d/00-opensuse-setup-installs

@@ -1,11 +0,0 @@
-#!/bin/bash
-# Install requirments needed to build the image.
-set -eu
-set -o pipefail
-
-# install kernel package needed by dkms.
-install-packages kernel-devel
-
-# sudo and lsb not included by default.
-# so install them.
-install-packages sudo lsb-release

elements/opensuse/install.d/package-installs-opensuse

@@ -0,0 +1,6 @@
+# sudo is not included by default.
+sudo
+# install kernel package needed by dkms.
+kernel-devel
+# lsb-release is not included by default.
+lsb-release

elements/redhat-common/element-deps

@@ -0,0 +1 @@
+package-installs

elements/redhat-common/install.d/package-installs-redhat-common

@@ -1,9 +1,6 @@
-#!/bin/bash
-
-set -eu
-set -o pipefail
-
 # Install any packages in this file that may not be in the base cloud
 # image but could reasonably be expected
-
+lsof
-install-packages which tcpdump traceroute lsof
+tcpdump
+traceroute
+which

elements/redhat-common/pre-install.d/15-remove-grub

@@ -3,9 +3,8 @@
 set -eu
 set -o pipefail
 
+# Must manually remove grub2 here, otherwise the download below does not work.
 yum remove -y grub2
-# Install grub2 dependencies to minimise packages installed during finalise.
-install-packages grub2-tools gettext os-prober system-logos
 
 # Remove all old versions of grub2 from the yum cache and then ensure the
 # latest version is in the cache.

elements/redhat-common/pre-install.d/package-installs-redhat-common

@@ -0,0 +1,5 @@
+gettext
+-grub2
+grub2-tools
+os-prober
+system-logos

elements/source-repositories/element-deps

@@ -1,2 +1,3 @@
 cache-url
 manifests
+package-installs

elements/source-repositories/install.d/package-installs-source-repositories

@@ -1,11 +1,5 @@
-#!/bin/bash
-
-set -uex
-set -o pipefail
-
 # Git isn't a dependency of this element, but is a dependency of pbr
 # if you are doing pip install on a git cloned directoy, because this
 # looks to be a fairly common pattern it makes sense to have git on the
 # target image
-install-packages git
+git
-

elements/stable-interface-names/element-deps

@@ -0,0 +1 @@
+package-installs

elements/stable-interface-names/install.d/02-stable-interface-names

@@ -8,5 +8,3 @@ NET_NAME_SLOT_FILE="/etc/udev/rules.d/80-net-name-slot.rules"
 if [ -h $NET_NAME_SLOT_FILE ]; then
     rm $NET_NAME_SLOT_FILE
 fi
-
-install-packages biosdevname

elements/stable-interface-names/install.d/package-installs-stable-interface-names

@@ -0,0 +1 @@
+biosdevname