ironic-discoverd-ramdisk element cleanup

- Properly rename files
- Use new package-installs
- Properly check for discoverd_callback_url option
  (and return backward compatibility)

Change-Id: I2247047b9360945408e720329d5b134cfa384ae5
This commit is contained in:
Dmitry Tantsur 2015-01-27 10:52:08 +01:00
parent 87b4bc7d51
commit 04a542134f
8 changed files with 17 additions and 25 deletions

View File

@ -0,0 +1 @@
package-installs

View File

@ -1,4 +1,15 @@
readonly DISCOVERD_URL=$(get_kernel_parameter discoverd_callback_url)
DISCOVERD_URL=$(get_kernel_parameter discoverd_callback_url)
if [ -z "$DISCOVERD_URL" ]; then
# Some old ramdisks are around
DISCOVERD_URL=$(get_kernel_parameter ironic_callback_url)
if [ -z "$DISCOVERD_URL" ]; then
echo "No discoverd_callback_url supplied"
troubleshoot
else
echo "WARNING: deprecated option ironic_callback_url"
echo "WARNING: use discoverd_callback_url instead"
fi
fi
function request_curl(){
HTTP_METHOD=$1

View File

@ -1,6 +0,0 @@
#!/bin/bash
set -eu
set -o pipefail
install-packages util-linux

View File

@ -1,6 +0,0 @@
#!/bin/bash
set -eu
set -o pipefail
install-packages curl

View File

@ -1,6 +0,0 @@
#!/bin/bash
set -eu
set -o pipefail
install-packages dmidecode

View File

@ -1,6 +0,0 @@
#!/bin/bash
set -eu
set -o pipefail
install-packages ipmitool

View File

@ -0,0 +1,4 @@
curl:
dmidecoded:
ipmitool:
util-linux: