gistfile1.diff

stack@devstack:~/devstack$ git diff
diff --git a/lib/ironic b/lib/ironic
index dbeb3d3..2b5cfaa 100644
--- a/lib/ironic
+++ b/lib/ironic
@@ -77,8 +77,8 @@ DIB_DIR=${DIB_DIR:-$DEST/diskimage-builder}
 IRONIC_BUILD_DEPLOY_RAMDISK=`trueorfalse True $IRONIC_BUILD_DEPLOY_RAMDISK`
 # If not use DIB, these files are used as deploy ramdisk/kernel.
 # (The value must be a absolute path)
-IRONIC_DEPLOY_RAMDISK=${IRONIC_DEPLOY_RAMDISK:-}
-IRONIC_DEPLOY_KERNEL=${IRONIC_DEPLOY_KERNEL:-}
+IRONIC_DEPLOY_RAMDISK=/opt/stack/ironic-python-agent/imagebuild/coreos/UPLOAD/coreos_production_pxe_image-oem.cpio.gz
+IRONIC_DEPLOY_KERNEL=/opt/stack/ironic-python-agent/imagebuild/coreos/UPLOAD/coreos_production_pxe.vmlinuz
 IRONIC_DEPLOY_ELEMENT=${IRONIC_DEPLOY_ELEMENT:-deploy-ironic}

 #TODO(agordeev): replace 'ubuntu' with host distro name getting
@@ -192,12 +192,15 @@ function configure_ironic_conductor {
     iniset $IRONIC_CONF_FILE DEFAULT rootwrap_config $IRONIC_ROOTWRAP_CONF
     iniset $IRONIC_CONF_FILE DEFAULT enabled_drivers $IRONIC_ENABLED_DRIVERS
     iniset $IRONIC_CONF_FILE conductor api_url http://$HOST_IP:6385
-    iniset $IRONIC_CONF_FILE pxe tftp_server $HOST_IP
-    iniset $IRONIC_CONF_FILE pxe tftp_root $IRONIC_TFTPBOOT_DIR
-    iniset $IRONIC_CONF_FILE pxe tftp_master_path $IRONIC_TFTPBOOT_DIR/master_images
+    iniset $IRONIC_CONF_FILE tftp tftp_server $HOST_IP
+    iniset $IRONIC_CONF_FILE tftp tftp_root $IRONIC_TFTPBOOT_DIR
+    iniset $IRONIC_CONF_FILE tftp tftp_master_path $IRONIC_TFTPBOOT_DIR/master_images
     if [[ "$IRONIC_VM_LOG_CONSOLE" == "True" ]] ; then
         iniset $IRONIC_CONF_FILE pxe pxe_append_params "nofb nomodeset vga=normal console=ttyS0"
     fi
+    if [[ "$IRONIC_VM_LOG_CONSOLE" == "True" ]] ; then
+        iniset $IRONIC_CONF_FILE agent pxe_append_params "nofb nomodeset vga=normal console=ttyS0"
+    fi
 }

 # create_ironic_cache_dir() - Part of the init_ironic() process
@@ -354,9 +357,9 @@ function enroll_vms {

     while read MAC; do

-        NODE_ID=$(ironic node-create --chassis_uuid $CHASSIS_ID --driver pxe_ssh \
-            -i pxe_deploy_kernel=$IRONIC_DEPLOY_KERNEL_ID \
-            -i pxe_deploy_ramdisk=$IRONIC_DEPLOY_RAMDISK_ID \
+        NODE_ID=$(ironic node-create --chassis_uuid $CHASSIS_ID --driver agent_ssh \
+            -i deploy_kernel=$IRONIC_DEPLOY_KERNEL_ID \
+            -i deploy_ramdisk=$IRONIC_DEPLOY_RAMDISK_ID \
             -i ssh_virt_type=$IRONIC_SSH_VIRT_TYPE \
             -i ssh_address=$IRONIC_VM_SSH_ADDRESS \
             -i ssh_port=$IRONIC_VM_SSH_PORT \