Merge "Migrate to new package-installs"

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

@@ -1 +0,0 @@
-tgt

elements/deploy-baremetal/package-installs.yaml

@@ -0,0 +1 @@
+tgt:

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

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

elements/deploy-ironic/package-installs.yaml

@@ -0,0 +1,2 @@
+curl:
+tgt:

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

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

elements/deploy-kexec/package-installs.yaml

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

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

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

elements/dracut-network/package-installs.yaml

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

elements/fedora/package-installs.yaml

@@ -1,13 +1,13 @@
 # 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.
 # https://bugzilla.redhat.com/show_bug.cgi?id=894307
-audit
+audit:
 
 # The version of openssl shipped in the fedora cloud image is no longer
 # compatible with new python environments installed by virtualenv, so we need
 # to update it first.
 # See https://bugs.launchpad.net/diskimage-builder/+bug/1254879
-openssl
+openssl:
 
 # FIXME: To avoid conflict between the pyOpenSSL installed via python-pip
 # 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,
 # this seems to be conflicting and causing the image building process to
 # fail. The problem is hapenning on a Fedora 18 system.
-python-pyopenssl
+python-pyopenssl:
 
 # Workaround for:
 # https://bugzilla.redhat.com/show_bug.cgi?id=1066983
-vim-minimal
+vim-minimal:

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

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

elements/hwdiscovery/package-installs.yaml

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

elements/opensuse/package-installs.yaml

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

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

@@ -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

elements/redhat-common/package-installs.yaml

@@ -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

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

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

elements/source-repositories/package-installs.yaml

@@ -2,4 +2,4 @@
 # 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
-git
+git:

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

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

elements/stable-interface-names/package-installs.yaml

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

elements/svc-map/package-installs.yaml

@@ -0,0 +1,2 @@
+PyYAML:
+    phase: pre-install.d

elements/svc-map/pre-install.d/package-installs-svc-map

@@ -1 +0,0 @@
-PyYAML