From b19fbc3dd557e322cfff9a58f7a14dc6347ba370 Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Fri, 11 Mar 2016 10:43:23 -0600 Subject: [PATCH] Use package-installs for undercloud elements Ideally all elements would be using package-installs so we only call yum once per stage, but since a lot of these elements are no longer used this change focuses on just the elements doing one-off package installs that I found in the undercloud install logs. A follow-up change would be to do the same kind of audit for the overcloud image build and fix up all of those elements. Change-Id: Ie204c5d0aa0f48d3d93d834b51a644d8562cd2fd --- .../ironic-conductor/install.d/68-ironic-conductor-common | 6 ------ elements/ironic-conductor/package-installs | 5 +++++ elements/openvswitch/element-deps | 1 + elements/openvswitch/install.d/74-openvswitch | 2 -- elements/openvswitch/package-installs | 1 + 5 files changed, 7 insertions(+), 8 deletions(-) delete mode 100755 elements/ironic-conductor/install.d/68-ironic-conductor-common create mode 100644 elements/ironic-conductor/package-installs create mode 100644 elements/openvswitch/package-installs diff --git a/elements/ironic-conductor/install.d/68-ironic-conductor-common b/elements/ironic-conductor/install.d/68-ironic-conductor-common deleted file mode 100755 index afc1d2c8f..000000000 --- a/elements/ironic-conductor/install.d/68-ironic-conductor-common +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -# ensure we have tftp and pxe requirements -install-packages syslinux tftpd-hpa xinetd parted psmisc diff --git a/elements/ironic-conductor/package-installs b/elements/ironic-conductor/package-installs new file mode 100644 index 000000000..3df039265 --- /dev/null +++ b/elements/ironic-conductor/package-installs @@ -0,0 +1,5 @@ +syslinux: +tftpd-hpa: +xinetd: +parted: +psmisc: diff --git a/elements/openvswitch/element-deps b/elements/openvswitch/element-deps index 2167c86fb..29e4e2426 100644 --- a/elements/openvswitch/element-deps +++ b/elements/openvswitch/element-deps @@ -1 +1,2 @@ os-svc-install +package-installs diff --git a/elements/openvswitch/install.d/74-openvswitch b/elements/openvswitch/install.d/74-openvswitch index 77b557c7d..90924749b 100755 --- a/elements/openvswitch/install.d/74-openvswitch +++ b/elements/openvswitch/install.d/74-openvswitch @@ -1,8 +1,6 @@ #!/bin/bash set -eux -install-packages -m openvswitch openvswitch-switch_package - if [ "$DIB_INIT_SYSTEM" == "systemd" ] ; then os-svc-enable -n openvswitch-switch fi diff --git a/elements/openvswitch/package-installs b/elements/openvswitch/package-installs new file mode 100644 index 000000000..d85e1c9c3 --- /dev/null +++ b/elements/openvswitch/package-installs @@ -0,0 +1 @@ +openvswitch-switch_package: