diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla
index 468c609b562fac787fa4f4b6deb8dc65b8418367..905c33ad09b4b1c33c6139558d5380d0442e47df 100644
--- a/ansible/group_vars/all/kolla
+++ b/ansible/group_vars/all/kolla
@@ -235,6 +235,7 @@ kolla_enable_glance: "yes"
 kolla_enable_haproxy: "yes"
 kolla_enable_ironic: "yes"
 kolla_enable_neutron: "yes"
+kolla_enable_nova: "yes"
 kolla_enable_magnum: "no"
 kolla_enable_murano: "no"
 kolla_enable_sahara: "no"
diff --git a/ansible/kolla-openstack.yml b/ansible/kolla-openstack.yml
index 337e32be10576a8c786f518221e9194869e0d250..f00445b4f1070cb0bd53d01e1d49bab21bf6caef 100644
--- a/ansible/kolla-openstack.yml
+++ b/ansible/kolla-openstack.yml
@@ -185,5 +185,7 @@
       kolla_extra_neutron_ml2: "{{ kolla_extra_config.neutron_ml2 | default }}"
       kolla_extra_nova: "{{ kolla_extra_config.nova | default }}"
       kolla_extra_sahara: "{{ kolla_extra_config.sahara | default }}"
-      kolla_extra_glance_path: "{{ kayobe_config_path }}/kolla/config/glance"
       kolla_extra_fluentd_output_path: "{{ kayobe_config_path }}/kolla/config/fluentd/output"
+      kolla_extra_glance_path: "{{ kayobe_config_path }}/kolla/config/glance"
+      kolla_extra_neutron_path: "{{ kayobe_config_path }}/kolla/config/neutron"
+      kolla_extra_nova_path: "{{ kayobe_config_path }}/kolla/config/nova"
diff --git a/ansible/roles/kolla-openstack/defaults/main.yml b/ansible/roles/kolla-openstack/defaults/main.yml
index 5b35e4638cc31e3c945ab5b17fe9d34e61fa2b6d..752699f0434110163219e517f699ee2c39f9bd0b 100644
--- a/ansible/roles/kolla-openstack/defaults/main.yml
+++ b/ansible/roles/kolla-openstack/defaults/main.yml
@@ -18,6 +18,9 @@ kolla_enable_glance:
 # glance-registry.conf.
 kolla_extra_glance:
 
+# Path to extra Glance configuration files.
+kolla_extra_glance_path:
+
 ###############################################################################
 # Ironic configuration.
 
@@ -252,6 +255,9 @@ kolla_extra_neutron:
 # Free form extra configuration to append to ml2_conf.ini.
 kolla_extra_neutron_ml2:
 
+# Path to extra Neutron configuration files.
+kolla_extra_neutron_path:
+
 ###############################################################################
 # Nova configuration.
 
@@ -261,6 +267,9 @@ kolla_enable_nova:
 # Free form extra configuration to append to nova.conf.
 kolla_extra_nova:
 
+# Path to extra Nova configuration files.
+kolla_extra_nova_path:
+
 ###############################################################################
 # Sahara configuration.
 
diff --git a/ansible/roles/kolla-openstack/tasks/config.yml b/ansible/roles/kolla-openstack/tasks/config.yml
index b715919e0bc0a876d04bb5e0d8c159f8a56dd20d..59d7c0c611c3f6007f3dbbcfcb5527a42482f053 100644
--- a/ansible/roles/kolla-openstack/tasks/config.yml
+++ b/ansible/roles/kolla-openstack/tasks/config.yml
@@ -6,11 +6,12 @@
     mode: 0750
   with_items:
     - { name: fluentd/output, enabled: "{{ kolla_extra_fluentd_output_path != None }}" }
+    - { name: glance, enabled: "{{ kolla_enable_glance }}" }
     - { name: ironic, enabled: "{{ kolla_enable_ironic }}" }
     - { name: neutron, enabled: "{{ kolla_enable_neutron }}" }
+    - { name: nova, enabled: "{{ kolla_enable_nova }}" }
     - { name: swift, enabled: "{{ kolla_enable_swift }}" }
-    - { name: glance, enabled: "{{ kolla_enable_glance }}" }
-  when: "{{ item.enabled | bool }}"
+  when: item.enabled | bool
 
 - name: Ensure the Kolla OpenStack configuration files exist
   template:
@@ -29,7 +30,7 @@
     - { src: nova.conf.j2, dest: nova.conf, enabled: "{{ kolla_enable_nova }}" }
     - { src: pxelinux.default.j2, dest: ironic/pxelinux.default, enabled: "{{ kolla_enable_ironic }}" }
     - { src: sahara.conf.j2, dest: sahara.conf, enabled: "{{ kolla_enable_sahara }}" }
-  when: "{{ item.enabled | bool }}"
+  when: item.enabled | bool
 
 - name: Ensure extra glance configuration files exist
   template:
@@ -38,7 +39,7 @@
     mode: 0640
   with_fileglob:
     - "{{ kolla_extra_glance_path }}/*"
-  when: "{{ kolla_extra_glance_path != None }}"
+  when: kolla_extra_glance_path != None
 
 - name: Ensure extra fluentd output configuration files exist
   template:
@@ -47,7 +48,7 @@
     mode: 0640
   with_fileglob:
     - "{{ kolla_extra_fluentd_output_path }}/*.conf"
-  when: "{{ kolla_extra_fluentd_output_path != None }}"
+  when: kolla_extra_fluentd_output_path != None
 
 - name: Ensure the ironic inspector kernel and ramdisk are downloaded
   get_url:
@@ -72,3 +73,21 @@
   when:
     - kolla_enable_ironic | bool
     - item.path != None
+
+- name: Ensure extra neutron configuration files exist
+  template:
+    src: "{{ item }}"
+    dest: "{{ kolla_node_custom_config_path }}/neutron/{{ item | basename }}"
+    mode: 0640
+  with_fileglob:
+    - "{{ kolla_extra_neutron_path }}/*"
+  when: kolla_extra_neutron_path != None
+
+- name: Ensure extra nova configuration files exist
+  template:
+    src: "{{ item }}"
+    dest: "{{ kolla_node_custom_config_path }}/nova/{{ item | basename }}"
+    mode: 0640
+  with_fileglob:
+    - "{{ kolla_extra_nova_path }}/*"
+  when: kolla_extra_nova_path != None
diff --git a/doc/source/release-notes.rst b/doc/source/release-notes.rst
index bf91f98da04f4bdb7e30454384fda906b9e6f8b5..9ba56294de8454eec45de8728ecdf1bba1c3bccc 100644
--- a/doc/source/release-notes.rst
+++ b/doc/source/release-notes.rst
@@ -11,8 +11,11 @@ Features
 * Adds ``--interface-limit`` and ``--interface-description-limit`` arguments to
   the ``kayobe physical network configure`` command.  These arguments allow
   configuration to be limited to a subset of switch interfaces.
-* Adds a ``display`` argument to ``kayobe physical network configure`` command.
-  This will output the candidate switch configuration without applying it.
+* Adds a ``--display`` argument to ``kayobe physical network configure``
+  command.  This will output the candidate switch configuration without
+  applying it.
+* Adds support for custom neutron and nova configuration files in
+  ``$KAYOBE_CONFIG_PATH/kolla/config/[neutron,nova]``.
 
 Upgrade Notes
 -------------