diff --git a/README.rst b/README.rst
index ddf253f..ba17691 100644
--- a/README.rst
+++ b/README.rst
@@ -208,6 +208,7 @@
         terminal_timeout: 10
         subprocess_checking_interval: 1
         subprocess_timeout: 10
+        kill_timeout: 1
         socat_address: 127.0.0.1
 
 You can read more info about it here:
@@ -259,6 +260,15 @@
           efi_system_partition_size: 200
           bios_boot_partition_size: 1
 
+Enable direct http deploy feature
+========================================================
+
+.. code-block:: yaml
+
+  ironic:
+    conductor:
+      image_download_source: http
+
 Upgrades
 ========
 
diff --git a/ironic/files/pike/ironic.conf b/ironic/files/pike/ironic.conf
index d3b1aa7..b7aba78 100644
--- a/ironic/files/pike/ironic.conf
+++ b/ironic/files/pike/ironic.conf
@@ -3818,6 +3818,19 @@
 # taken from the matchmaker. (list value)
 #subscribe_on =
 
+[oslo_middleware]
+
+#
+# From oslo.middleware.http_proxy_to_wsgi
+#
+
+# Whether the application is behind a proxy or not. This
+# determines if the middleware should parse the headers or
+# not. (boolean value)
+#enable_proxy_headers_parsing = false
+{%- if ironic.get('middleware', {}).enable_proxy_headers_parsing is defined %}
+enable_proxy_headers_parsing = {{ ironic.middleware.enable_proxy_headers_parsing }}
+{%- endif %}
 
 [oslo_policy]
 
diff --git a/ironic/files/queens/ironic.conf b/ironic/files/queens/ironic.conf
index d2d08cc..9e659a1 100644
--- a/ironic/files/queens/ironic.conf
+++ b/ironic/files/queens/ironic.conf
@@ -665,6 +665,22 @@
 # is configured to "swift". (integer value)
 #deploy_logs_swift_days_to_expire = 30
 
+# Specifies whether direct deploy interface should try to use
+# the image source directly or if ironic should cache the
+# image on the conductor and serve it from ironic's own http
+# server. This option takes effect only when instance image is
+# provided from the Image service. (string value)
+# Possible values:
+# swift - IPA ramdisk retrieves instance image from the Object
+# Storage service.
+# http - IPA ramdisk retrieves instance image from HTTP
+# service served at conductor nodes.
+{%- if conductor.image_download_source is defined %}
+image_download_source = {{ conductor.image_download_source }}
+{%- else %}
+#image_download_source = swift
+{%- endif %}
+
 
 [ansible]
 
@@ -1262,6 +1278,15 @@
 #subprocess_timeout = 10
 {%- endif %}
 
+# Time (in seconds) to wait for the shellinabox console
+# subprocess to exit before sending SIGKILL signal. (integer
+# value)
+{%- if conductor.get('console', {}).kill_timeout is defined %}
+kill_timeout = {{ conductor.console.kill_timeout }}
+{%- else %}
+#kill_timeout = 1
+{%- endif %}
+
 # IP address of Socat service running on the host of ironic
 # conductor. Used only by Socat console. (IP address value)
 {%- if conductor.get('console', {}).socat_address is defined %}
@@ -1369,6 +1394,17 @@
 # Deprecated group/name - [conductor]/configdrive_use_swift
 #configdrive_use_object_store = false
 
+# The name of subdirectory under ironic-conductor node's HTTP
+# root path which is used to place instance images for the
+# direct deploy interface, when local HTTP service is
+# incorporated to provide instance image instead of swift
+# tempurls. (string value)
+{%- if conductor.http_image_subdir is defined %}
+http_image_subdir = {{ conductor.http_image_subdir }}
+{%- else %}
+#http_image_subdir = agent_images
+{%- endif%}
+
 # Type of object store endpoint type to be used as a backend
 # (string value)
 # Possible values:
@@ -2347,6 +2383,12 @@
 {%- include "oslo_templates/files/queens/oslo/messaging/_" + messaging_engine + ".conf" %}
 {%- endif %}
 
+[oslo_middleware]
+{%- if ironic.middleware is defined %}
+{%- set _data = ironic.middleware %}
+{%- include "oslo_templates/files/queens/oslo/_middleware.conf" %}
+{%- endif %}
+
 [oslo_policy]
 {%- if ironic.policy is defined %}
 {%- set _data = ironic.policy %}
diff --git a/ironic/files/rocky/ironic.conf b/ironic/files/rocky/ironic.conf
index f9e3809..e7452f7 100644
--- a/ironic/files/rocky/ironic.conf
+++ b/ironic/files/rocky/ironic.conf
@@ -2773,6 +2773,12 @@
 {%- include "oslo_templates/files/rocky/oslo/messaging/_" + messaging_engine + ".conf" %}
 {%- endif %}
 
+[oslo_middleware]
+{%- if ironic.middleware is defined %}
+{%- set _data = ironic.middleware %}
+{%- include "oslo_templates/files/queens/oslo/_middleware.conf" %}
+{%- endif %}
+
 [oslo_policy]
 {%- if ironic.policy is defined %}
 {%- set _data = ironic.policy %}