From 26266069801986a35a07200790bb597b5dffc513 Mon Sep 17 00:00:00 2001 From: Gregory Haynes Date: Wed, 26 Nov 2014 13:35:36 -0800 Subject: [PATCH] Migrate to new package-installs We have a new package-installs file format. Migrating existing package-installs files to the new format. Change-Id: I57d4a007efee9624e60c41357cefa627d8c7373f --- .../install.d/package-installs-deploy-baremetal | 1 - elements/deploy-baremetal/package-installs.yaml | 1 + .../install.d/package-installs-deploy-ironic | 2 -- elements/deploy-ironic/package-installs.yaml | 2 ++ .../install.d/package-installs-deploy-kexec | 1 - elements/deploy-kexec/package-installs.yaml | 1 + .../install.d/package-installs-dracut-network | 2 -- elements/dracut-network/package-installs.yaml | 2 ++ ...age-installs-fedora => package-installs.yaml} | 8 ++++---- .../install.d/package-installs-hwdiscovery | 1 - elements/hwdiscovery/package-installs.yaml | 1 + ...e-installs-opensuse => package-installs.yaml} | 6 +++--- .../install.d/package-installs-redhat-common | 6 ------ elements/redhat-common/package-installs.yaml | 16 ++++++++++++++++ .../pre-install.d/package-installs-redhat-common | 5 ----- ...source-repositories => package-installs.yaml} | 2 +- .../package-installs-stable-interface-names | 1 - .../stable-interface-names/package-installs.yaml | 1 + elements/svc-map/package-installs.yaml | 2 ++ .../pre-install.d/package-installs-svc-map | 1 - 20 files changed, 34 insertions(+), 28 deletions(-) delete mode 100644 elements/deploy-baremetal/install.d/package-installs-deploy-baremetal create mode 100644 elements/deploy-baremetal/package-installs.yaml delete mode 100644 elements/deploy-ironic/install.d/package-installs-deploy-ironic create mode 100644 elements/deploy-ironic/package-installs.yaml delete mode 100644 elements/deploy-kexec/install.d/package-installs-deploy-kexec create mode 100644 elements/deploy-kexec/package-installs.yaml delete mode 100644 elements/dracut-network/install.d/package-installs-dracut-network create mode 100644 elements/dracut-network/package-installs.yaml rename elements/fedora/{install.d/package-installs-fedora => package-installs.yaml} (95%) delete mode 100644 elements/hwdiscovery/install.d/package-installs-hwdiscovery create mode 100644 elements/hwdiscovery/package-installs.yaml rename elements/opensuse/{install.d/package-installs-opensuse => package-installs.yaml} (78%) delete mode 100644 elements/redhat-common/install.d/package-installs-redhat-common create mode 100644 elements/redhat-common/package-installs.yaml delete mode 100644 elements/redhat-common/pre-install.d/package-installs-redhat-common rename elements/source-repositories/{install.d/package-installs-source-repositories => package-installs.yaml} (97%) delete mode 100644 elements/stable-interface-names/install.d/package-installs-stable-interface-names create mode 100644 elements/stable-interface-names/package-installs.yaml create mode 100644 elements/svc-map/package-installs.yaml delete mode 100644 elements/svc-map/pre-install.d/package-installs-svc-map diff --git a/elements/deploy-baremetal/install.d/package-installs-deploy-baremetal b/elements/deploy-baremetal/install.d/package-installs-deploy-baremetal deleted file mode 100644 index 786509ca..00000000 --- a/elements/deploy-baremetal/install.d/package-installs-deploy-baremetal +++ /dev/null @@ -1 +0,0 @@ -tgt diff --git a/elements/deploy-baremetal/package-installs.yaml b/elements/deploy-baremetal/package-installs.yaml new file mode 100644 index 00000000..79df9f9a --- /dev/null +++ b/elements/deploy-baremetal/package-installs.yaml @@ -0,0 +1 @@ +tgt: diff --git a/elements/deploy-ironic/install.d/package-installs-deploy-ironic b/elements/deploy-ironic/install.d/package-installs-deploy-ironic deleted file mode 100644 index 3da7a781..00000000 --- a/elements/deploy-ironic/install.d/package-installs-deploy-ironic +++ /dev/null @@ -1,2 +0,0 @@ -curl -tgt diff --git a/elements/deploy-ironic/package-installs.yaml b/elements/deploy-ironic/package-installs.yaml new file mode 100644 index 00000000..e9ef0429 --- /dev/null +++ b/elements/deploy-ironic/package-installs.yaml @@ -0,0 +1,2 @@ +curl: +tgt: diff --git a/elements/deploy-kexec/install.d/package-installs-deploy-kexec b/elements/deploy-kexec/install.d/package-installs-deploy-kexec deleted file mode 100644 index 148df5eb..00000000 --- a/elements/deploy-kexec/install.d/package-installs-deploy-kexec +++ /dev/null @@ -1 +0,0 @@ -kexec-tools diff --git a/elements/deploy-kexec/package-installs.yaml b/elements/deploy-kexec/package-installs.yaml new file mode 100644 index 00000000..ff369159 --- /dev/null +++ b/elements/deploy-kexec/package-installs.yaml @@ -0,0 +1 @@ +kexec-tools: diff --git a/elements/dracut-network/install.d/package-installs-dracut-network b/elements/dracut-network/install.d/package-installs-dracut-network deleted file mode 100644 index 443c70fc..00000000 --- a/elements/dracut-network/install.d/package-installs-dracut-network +++ /dev/null @@ -1,2 +0,0 @@ -dracut-network -patch diff --git a/elements/dracut-network/package-installs.yaml b/elements/dracut-network/package-installs.yaml new file mode 100644 index 00000000..56d94ec1 --- /dev/null +++ b/elements/dracut-network/package-installs.yaml @@ -0,0 +1,2 @@ +dracut-network: +patch: diff --git a/elements/fedora/install.d/package-installs-fedora b/elements/fedora/package-installs.yaml similarity index 95% rename from elements/fedora/install.d/package-installs-fedora rename to elements/fedora/package-installs.yaml index afcc802b..2f620085 100644 --- a/elements/fedora/install.d/package-installs-fedora +++ b/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: diff --git a/elements/hwdiscovery/install.d/package-installs-hwdiscovery b/elements/hwdiscovery/install.d/package-installs-hwdiscovery deleted file mode 100644 index edd07ff6..00000000 --- a/elements/hwdiscovery/install.d/package-installs-hwdiscovery +++ /dev/null @@ -1 +0,0 @@ -hwinfo diff --git a/elements/hwdiscovery/package-installs.yaml b/elements/hwdiscovery/package-installs.yaml new file mode 100644 index 00000000..65d2c4d7 --- /dev/null +++ b/elements/hwdiscovery/package-installs.yaml @@ -0,0 +1 @@ +hwinfo: diff --git a/elements/opensuse/install.d/package-installs-opensuse b/elements/opensuse/package-installs.yaml similarity index 78% rename from elements/opensuse/install.d/package-installs-opensuse rename to elements/opensuse/package-installs.yaml index 7cd8381d..16141071 100644 --- a/elements/opensuse/install.d/package-installs-opensuse +++ b/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: diff --git a/elements/redhat-common/install.d/package-installs-redhat-common b/elements/redhat-common/install.d/package-installs-redhat-common deleted file mode 100644 index c91322e8..00000000 --- a/elements/redhat-common/install.d/package-installs-redhat-common +++ /dev/null @@ -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 diff --git a/elements/redhat-common/package-installs.yaml b/elements/redhat-common/package-installs.yaml new file mode 100644 index 00000000..71e5f517 --- /dev/null +++ b/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 diff --git a/elements/redhat-common/pre-install.d/package-installs-redhat-common b/elements/redhat-common/pre-install.d/package-installs-redhat-common deleted file mode 100644 index 7a4b675d..00000000 --- a/elements/redhat-common/pre-install.d/package-installs-redhat-common +++ /dev/null @@ -1,5 +0,0 @@ -gettext -grub2-tools -os-prober -redhat-lsb-core -system-logos diff --git a/elements/source-repositories/install.d/package-installs-source-repositories b/elements/source-repositories/package-installs.yaml similarity index 97% rename from elements/source-repositories/install.d/package-installs-source-repositories rename to elements/source-repositories/package-installs.yaml index fd6b19e8..9598f0c5 100644 --- a/elements/source-repositories/install.d/package-installs-source-repositories +++ b/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: diff --git a/elements/stable-interface-names/install.d/package-installs-stable-interface-names b/elements/stable-interface-names/install.d/package-installs-stable-interface-names deleted file mode 100644 index 9fd202f2..00000000 --- a/elements/stable-interface-names/install.d/package-installs-stable-interface-names +++ /dev/null @@ -1 +0,0 @@ -biosdevname diff --git a/elements/stable-interface-names/package-installs.yaml b/elements/stable-interface-names/package-installs.yaml new file mode 100644 index 00000000..1c9f3565 --- /dev/null +++ b/elements/stable-interface-names/package-installs.yaml @@ -0,0 +1 @@ +biosdevname: diff --git a/elements/svc-map/package-installs.yaml b/elements/svc-map/package-installs.yaml new file mode 100644 index 00000000..b7303da6 --- /dev/null +++ b/elements/svc-map/package-installs.yaml @@ -0,0 +1,2 @@ +PyYAML: + phase: pre-install.d diff --git a/elements/svc-map/pre-install.d/package-installs-svc-map b/elements/svc-map/pre-install.d/package-installs-svc-map deleted file mode 100644 index 5500f007..00000000 --- a/elements/svc-map/pre-install.d/package-installs-svc-map +++ /dev/null @@ -1 +0,0 @@ -PyYAML