diff --git a/ansible/kolla-openstack.yml b/ansible/kolla-openstack.yml
index 220896dcaa7ab7efc6de990d0dc0a47e680cb55d..ebe334412be486605591f699aef2ef858fdab0a0 100644
--- a/ansible/kolla-openstack.yml
+++ b/ansible/kolla-openstack.yml
@@ -107,6 +107,7 @@
             - { name: cinder, file: cinder.conf }
             - { name: designate, file: designate.conf }
             - { name: glance, file: glance.conf }
+            - { name: global, file: global.conf }
             - { name: gnocchi, file: gnocchi.conf }
             - { name: grafana, file: grafana.ini }
             - { name: heat, file: heat.conf }
@@ -214,6 +215,7 @@
       kolla_extra_cinder: "{{ kolla_extra_config.cinder | default }}"
       kolla_extra_designate: "{{ kolla_extra_config.designate | default }}"
       kolla_extra_glance: "{{ kolla_extra_config.glance | default }}"
+      kolla_extra_global: "{{ kolla_extra_config.global | default }}"
       kolla_extra_gnocchi: "{{ kolla_extra_config.gnocchi | default }}"
       kolla_extra_grafana: "{{ kolla_extra_config.grafana | default }}"
       kolla_extra_heat: "{{ kolla_extra_config.heat | default }}"
diff --git a/ansible/roles/kolla-openstack/defaults/main.yml b/ansible/roles/kolla-openstack/defaults/main.yml
index e1bedebcfd638cd0f293da4a35487d29b61d9519..c7ccc410127dc6d9603bbabdc652ca1fff982976 100644
--- a/ansible/roles/kolla-openstack/defaults/main.yml
+++ b/ansible/roles/kolla-openstack/defaults/main.yml
@@ -5,6 +5,12 @@ kolla_extra_config_path:
 # Directory where Kolla custom configuration files will be installed.
 kolla_node_custom_config_path: /etc/kolla/config
 
+###############################################################################
+# Global configuration.
+
+# Free form extra configuration to append to global.conf.
+kolla_extra_global:
+
 ###############################################################################
 # Barbican configuration.
 
diff --git a/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml b/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
index bcf3bb6a6ffec0f694ba113a5ff9b942c221cee0..cc05794348d16c2b7bb5cbcfc88ac306ec802d88 100644
--- a/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
+++ b/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
@@ -34,6 +34,8 @@ provisioner:
         kolla_extra_glance: |
           [extra-glance.conf]
           foo=bar
+        kolla_extra_global: |
+          [extra-global.conf]
         kolla_enable_gnocchi: true
         kolla_extra_gnocchi: |
           [extra-gnocchi.conf]
diff --git a/ansible/roles/kolla-openstack/tasks/config.yml b/ansible/roles/kolla-openstack/tasks/config.yml
index 1396fa343742934f4c58ddaef7d13f3c533f57e3..2e5d9e2941d0620464c4f83cb0f83583b37c3556 100644
--- a/ansible/roles/kolla-openstack/tasks/config.yml
+++ b/ansible/roles/kolla-openstack/tasks/config.yml
@@ -19,6 +19,7 @@
     - { src: designate.conf.j2, dest: designate.conf, enabled: "{{ kolla_enable_designate }}" }
     - { src: galera.cnf.j2, dest: galera.cnf, enabled: "{{ kolla_enable_mariadb }}" }
     - { src: glance.conf.j2, dest: glance.conf, enabled: "{{ kolla_enable_glance }}" }
+    - { src: global.conf.j2, dest: global.conf, enabled: true }
     - { src: gnocchi.conf.j2, dest: gnocchi.conf, enabled: "{{ kolla_enable_gnocchi }}" }
     - { src: grafana.ini.j2, dest: grafana.ini, enabled: "{{ kolla_enable_grafana }}" }
     - { src: heat.conf.j2, dest: heat.conf, enabled: "{{ kolla_enable_heat }}" }
diff --git a/ansible/roles/kolla-openstack/templates/global.conf.j2 b/ansible/roles/kolla-openstack/templates/global.conf.j2
new file mode 100644
index 0000000000000000000000000000000000000000..5b27f3623cae15493289b31e073f04d03612e6f3
--- /dev/null
+++ b/ansible/roles/kolla-openstack/templates/global.conf.j2
@@ -0,0 +1,9 @@
+# {{ ansible_managed }}
+
+{% if kolla_extra_global %}
+#######################
+# Extra configuration
+#######################
+
+{{ kolla_extra_global }}
+{% endif %}
diff --git a/doc/source/configuration/kolla-ansible.rst b/doc/source/configuration/kolla-ansible.rst
index 35ac2bdaab7615ee9ac1324bb0a582bf8447a947..6c5cc15a6c7e334090f63df1ad02589f3a5076a0 100644
--- a/doc/source/configuration/kolla-ansible.rst
+++ b/doc/source/configuration/kolla-ansible.rst
@@ -164,6 +164,7 @@ which files are supported.
    ``fluentd/output``              Fluentd output configuration.
    ``glance.conf``                 Glance configuration.
    ``glance/*``                    Extended Glance configuration.
+   ``global.conf``                 Global configuration for all OpenStack services.
    ``gnocchi.conf``                Gnocchi configuration.
    ``gnocchi/*``                   Extended Gnocchi configuration.
    ``grafana/*``                   Extended Grafana configuration.
diff --git a/releasenotes/notes/add-support-for-global-conf-411316a7250611b4.yaml b/releasenotes/notes/add-support-for-global-conf-411316a7250611b4.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..384b78d0bafc6b2be585deafbab71aef56d83ff3
--- /dev/null
+++ b/releasenotes/notes/add-support-for-global-conf-411316a7250611b4.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - Adds support for overriding configuration globally for all OpenStack
+    services by generating a ``global.conf`` file for use by Kolla Ansible.
+    See `story 2005904 <https://storyboard.openstack.org/#!/story/2005904>`__
+    for details.