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: