openstack/ironic
Code Issues Proposed changes

Merge "Make iPXE + TinyIPA the defaults for devstack"

Browse Source
This commit is contained in:
Jenkins 2016-05-14 11:15:57 +00:00 committed by Gerrit Code Review
commit 70d826dba9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/lib/ironic
View File

@ -125,7 +125,7 @@ IRONIC_VM_LOG_ROTATE=$(trueorfalse True IRONIC_VM_LOG_ROTATE)
IRONIC_BUILD_DEPLOY_RAMDISK=$(trueorfalse True IRONIC_BUILD_DEPLOY_RAMDISK) IRONIC_BUILD_DEPLOY_RAMDISK=$(trueorfalse True IRONIC_BUILD_DEPLOY_RAMDISK)
# Ironic IPA ramdisk type, supported types are: coreos, tinyipa. # Ironic IPA ramdisk type, supported types are: coreos, tinyipa.
IRONIC_RAMDISK_TYPE=${IRONIC_RAMDISK_TYPE:-coreos} IRONIC_RAMDISK_TYPE=${IRONIC_RAMDISK_TYPE:-tinyipa}
# If not use DIB, these files are used as deploy ramdisk/kernel. # If not use DIB, these files are used as deploy ramdisk/kernel.
# (The value must be an absolute path) # (The value must be an absolute path)
@ -170,7 +170,7 @@ IRONIC_SERVICE_PORT=${IRONIC_SERVICE_PORT:-6385}
IRONIC_HOSTPORT=${IRONIC_HOSTPORT:-$SERVICE_HOST:$IRONIC_SERVICE_PORT} IRONIC_HOSTPORT=${IRONIC_HOSTPORT:-$SERVICE_HOST:$IRONIC_SERVICE_PORT}
# Enable iPXE # Enable iPXE
IRONIC_IPXE_ENABLED=$(trueorfalse False IRONIC_IPXE_ENABLED) IRONIC_IPXE_ENABLED=$(trueorfalse True IRONIC_IPXE_ENABLED)
IRONIC_HTTP_DIR=${IRONIC_HTTP_DIR:-$IRONIC_DATA_DIR/httpboot} IRONIC_HTTP_DIR=${IRONIC_HTTP_DIR:-$IRONIC_DATA_DIR/httpboot}
IRONIC_HTTP_SERVER=${IRONIC_HTTP_SERVER:-$HOST_IP} IRONIC_HTTP_SERVER=${IRONIC_HTTP_SERVER:-$HOST_IP}
IRONIC_HTTP_PORT=${IRONIC_HTTP_PORT:-8088} IRONIC_HTTP_PORT=${IRONIC_HTTP_PORT:-8088}