Use package-installs in more elements
Updates additional elements in diskimage-builder to use the declarative package install support provided by the package-installs element. package-installs does not yet support the pkg-map functionality, so elements using pkg-map are not migrated. That support will come in the near future. Change-Id: I3d36adad317ba44326eabd95243d45807e2a8a16
This commit is contained in:
James Slagle
parent
1d86c54825
commit
07c22185bd
1
elements/deploy-baremetal/element-deps
Normal file
1
elements/deploy-baremetal/element-deps
Normal file
@ -0,0 +1 @@
|
||||
package-installs
|
||||
@ -1,6 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -eu
|
||||
set -o pipefail
|
||||
|
||||
install-packages tgt
|
||||
@ -1,6 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -eu
|
||||
set -o pipefail
|
||||
|
||||
install-packages busybox
|
||||
@ -0,0 +1,2 @@
|
||||
busybox
|
||||
tgt
|
||||
1
elements/deploy-ironic/element-deps
Normal file
1
elements/deploy-ironic/element-deps
Normal file
@ -0,0 +1 @@
|
||||
package-installs
|
||||
@ -1,6 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -eu
|
||||
set -o pipefail
|
||||
|
||||
install-packages tgt
|
||||
@ -1,6 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -eu
|
||||
set -o pipefail
|
||||
|
||||
install-packages busybox
|
||||
@ -1,6 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -eu
|
||||
set -o pipefail
|
||||
|
||||
install-packages curl
|
||||
@ -0,0 +1,3 @@
|
||||
busybox
|
||||
curl
|
||||
tgt
|
||||
@ -1 +1,2 @@
|
||||
deploy-baremetal
|
||||
package-installs
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -eu
|
||||
set -o pipefail
|
||||
|
||||
install-packages kexec-tools
|
||||
@ -0,0 +1 @@
|
||||
kexec-tools
|
||||
@ -1 +1,2 @@
|
||||
package-installs
|
||||
select-boot-kernel-initrd
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -eu
|
||||
set -o pipefail
|
||||
|
||||
install-packages dracut-network patch
|
||||
@ -0,0 +1,2 @@
|
||||
dracut-network
|
||||
patch
|
||||
1
elements/hwdiscovery/element-deps
Normal file
1
elements/hwdiscovery/element-deps
Normal file
@ -0,0 +1 @@
|
||||
package-installs
|
||||
@ -1,8 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Support for hard ware discovery
|
||||
|
||||
set -eu
|
||||
set -o pipefail
|
||||
set -o xtrace
|
||||
|
||||
install-packages hwinfo
|
||||
@ -0,0 +1 @@
|
||||
hwinfo
|
||||
@ -1,3 +1,4 @@
|
||||
cache-url
|
||||
dib-run-parts
|
||||
package-installs
|
||||
zypper
|
||||
|
||||
@ -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
|
||||
6
elements/opensuse/install.d/package-installs-opensuse
Normal file
6
elements/opensuse/install.d/package-installs-opensuse
Normal file
@ -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
|
||||
1
elements/redhat-common/element-deps
Normal file
1
elements/redhat-common/element-deps
Normal file
@ -0,0 +1 @@
|
||||
package-installs
|
||||
11
elements/redhat-common/install.d/01-install-deps → elements/redhat-common/install.d/package-installs-redhat-common
Executable file → Normal file
11
elements/redhat-common/install.d/01-install-deps → elements/redhat-common/install.d/package-installs-redhat-common
Executable file → Normal file
@ -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
|
||||
|
||||
install-packages which tcpdump traceroute lsof
|
||||
lsof
|
||||
tcpdump
|
||||
traceroute
|
||||
which
|
||||
@ -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.
|
||||
|
||||
@ -0,0 +1,5 @@
|
||||
gettext
|
||||
-grub2
|
||||
grub2-tools
|
||||
os-prober
|
||||
system-logos
|
||||
@ -1,2 +1,3 @@
|
||||
cache-url
|
||||
manifests
|
||||
package-installs
|
||||
|
||||
@ -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
|
||||
1
elements/stable-interface-names/element-deps
Normal file
1
elements/stable-interface-names/element-deps
Normal file
@ -0,0 +1 @@
|
||||
package-installs
|
||||
@ -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
|
||||
|
||||
@ -0,0 +1 @@
|
||||
biosdevname
|
||||
Loading…
Reference in New Issue
Block a user