Merge "Migrate to new package-installs"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
5de977e575
@ -1 +0,0 @@
|
|||||||
tgt
|
|
||||||
1
elements/deploy-baremetal/package-installs.yaml
Normal file
1
elements/deploy-baremetal/package-installs.yaml
Normal file
@ -0,0 +1 @@
|
|||||||
|
tgt:
|
||||||
@ -1,2 +0,0 @@
|
|||||||
curl
|
|
||||||
tgt
|
|
||||||
2
elements/deploy-ironic/package-installs.yaml
Normal file
2
elements/deploy-ironic/package-installs.yaml
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
curl:
|
||||||
|
tgt:
|
||||||
@ -1 +0,0 @@
|
|||||||
kexec-tools
|
|
||||||
1
elements/deploy-kexec/package-installs.yaml
Normal file
1
elements/deploy-kexec/package-installs.yaml
Normal file
@ -0,0 +1 @@
|
|||||||
|
kexec-tools:
|
||||||
@ -1,2 +0,0 @@
|
|||||||
dracut-network
|
|
||||||
patch
|
|
||||||
2
elements/dracut-network/package-installs.yaml
Normal file
2
elements/dracut-network/package-installs.yaml
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
dracut-network:
|
||||||
|
patch:
|
||||||
@ -1,13 +1,13 @@
|
|||||||
# On a fresh Fedora 18 install you might have to update audit in order to
|
# On a fresh Fedora 18 install you might have to update audit in order to
|
||||||
# fix a conflict with a file from the glibc package.
|
# fix a conflict with a file from the glibc package.
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=894307
|
# https://bugzilla.redhat.com/show_bug.cgi?id=894307
|
||||||
audit
|
audit:
|
||||||
|
|
||||||
# The version of openssl shipped in the fedora cloud image is no longer
|
# The version of openssl shipped in the fedora cloud image is no longer
|
||||||
# compatible with new python environments installed by virtualenv, so we need
|
# compatible with new python environments installed by virtualenv, so we need
|
||||||
# to update it first.
|
# to update it first.
|
||||||
# See https://bugs.launchpad.net/diskimage-builder/+bug/1254879
|
# See https://bugs.launchpad.net/diskimage-builder/+bug/1254879
|
||||||
openssl
|
openssl:
|
||||||
|
|
||||||
# FIXME: To avoid conflict between the pyOpenSSL installed via python-pip
|
# FIXME: To avoid conflict between the pyOpenSSL installed via python-pip
|
||||||
# and pyOpenSSL installed via yum, we are going to sort it out installing
|
# and pyOpenSSL installed via yum, we are going to sort it out installing
|
||||||
@ -17,8 +17,8 @@ openssl
|
|||||||
# dependency of the python-paste package needed for the heat element,
|
# dependency of the python-paste package needed for the heat element,
|
||||||
# this seems to be conflicting and causing the image building process to
|
# this seems to be conflicting and causing the image building process to
|
||||||
# fail. The problem is hapenning on a Fedora 18 system.
|
# fail. The problem is hapenning on a Fedora 18 system.
|
||||||
python-pyopenssl
|
python-pyopenssl:
|
||||||
|
|
||||||
# Workaround for:
|
# Workaround for:
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1066983
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1066983
|
||||||
vim-minimal
|
vim-minimal:
|
||||||
@ -1 +0,0 @@
|
|||||||
hwinfo
|
|
||||||
1
elements/hwdiscovery/package-installs.yaml
Normal file
1
elements/hwdiscovery/package-installs.yaml
Normal file
@ -0,0 +1 @@
|
|||||||
|
hwinfo:
|
||||||
@ -1,6 +1,6 @@
|
|||||||
# sudo is not included by default.
|
# sudo is not included by default.
|
||||||
sudo
|
sudo:
|
||||||
# install kernel package needed by dkms.
|
# install kernel package needed by dkms.
|
||||||
kernel-devel
|
kernel-devel:
|
||||||
# lsb-release is not included by default.
|
# lsb-release is not included by default.
|
||||||
lsb-release
|
lsb-release:
|
||||||
@ -1,6 +0,0 @@
|
|||||||
# Install any packages in this file that may not be in the base cloud
|
|
||||||
# image but could reasonably be expected
|
|
||||||
lsof
|
|
||||||
tcpdump
|
|
||||||
traceroute
|
|
||||||
which
|
|
||||||
16
elements/redhat-common/package-installs.yaml
Normal file
16
elements/redhat-common/package-installs.yaml
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
# Install any packages in this file that may not be in the base cloud
|
||||||
|
# image but could reasonably be expected
|
||||||
|
lsof:
|
||||||
|
tcpdump:
|
||||||
|
traceroute:
|
||||||
|
which:
|
||||||
|
gettext:
|
||||||
|
phase: pre-install.d
|
||||||
|
grub2-tools:
|
||||||
|
phase: pre-install.d
|
||||||
|
os-prober:
|
||||||
|
phase: pre-install.d
|
||||||
|
redhat-lsb-core:
|
||||||
|
phase: pre-install.d
|
||||||
|
system-logos:
|
||||||
|
phase: pre-install.d
|
||||||
@ -1,5 +0,0 @@
|
|||||||
gettext
|
|
||||||
grub2-tools
|
|
||||||
os-prober
|
|
||||||
redhat-lsb-core
|
|
||||||
system-logos
|
|
||||||
@ -2,4 +2,4 @@
|
|||||||
# if you are doing pip install on a git cloned directoy, because this
|
# 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
|
# looks to be a fairly common pattern it makes sense to have git on the
|
||||||
# target image
|
# target image
|
||||||
git
|
git:
|
||||||
@ -1 +0,0 @@
|
|||||||
biosdevname
|
|
||||||
1
elements/stable-interface-names/package-installs.yaml
Normal file
1
elements/stable-interface-names/package-installs.yaml
Normal file
@ -0,0 +1 @@
|
|||||||
|
biosdevname:
|
||||||
2
elements/svc-map/package-installs.yaml
Normal file
2
elements/svc-map/package-installs.yaml
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
PyYAML:
|
||||||
|
phase: pre-install.d
|
||||||
@ -1 +0,0 @@
|
|||||||
PyYAML
|
|
||||||
Loading…
Reference in New Issue
Block a user