diff --git a/keystone/files/newton/keystone.conf.Debian b/keystone/files/newton/keystone.conf.Debian
index 83f4b13..5da7242 100644
--- a/keystone/files/newton/keystone.conf.Debian
+++ b/keystone/files/newton/keystone.conf.Debian
@@ -2935,3 +2935,12 @@
 #driver = sql
 [extra_headers]
 Distribution = Ubuntu
+
+{% if server.extra_config is defined %}
+{%- for section, params in server.extra_config.iteritems() %}
+[{{ section }}]
+{%- for param, value in params.iteritems() %}
+{{ param }} = {{ value }}
+{%- endfor %}
+{%- endfor %}
+{%- endif %}
diff --git a/keystone/files/ocata/keystone.conf.Debian b/keystone/files/ocata/keystone.conf.Debian
index c15982f..aeaf2d1 100644
--- a/keystone/files/ocata/keystone.conf.Debian
+++ b/keystone/files/ocata/keystone.conf.Debian
@@ -3118,3 +3118,12 @@
 #driver = sql
 [extra_headers]
 Distribution = Ubuntu
+
+{% if server.extra_config is defined %}
+{%- for section, params in server.extra_config.iteritems() %}
+[{{ section }}]
+{%- for param, value in params.iteritems() %}
+{{ param }} = {{ value }}
+{%- endfor %}
+{%- endfor %}
+{%- endif %}
diff --git a/keystone/files/ocata/keystone.conf.RedHat b/keystone/files/ocata/keystone.conf.RedHat
index 7f4d9f1..b3c159e 100644
--- a/keystone/files/ocata/keystone.conf.RedHat
+++ b/keystone/files/ocata/keystone.conf.RedHat
@@ -3065,3 +3065,12 @@
 #driver = sql
 [extra_headers]
 Distribution = Ubuntu
+
+{% if server.extra_config is defined %}
+{%- for section, params in server.extra_config.iteritems() %}
+[{{ section }}]
+{%- for param, value in params.iteritems() %}
+{{ param }} = {{ value }}
+{%- endfor %}
+{%- endfor %}
+{%- endif %}
diff --git a/keystone/files/pike/keystone.conf.Debian b/keystone/files/pike/keystone.conf.Debian
index 23c3d57..84b6b9f 100644
--- a/keystone/files/pike/keystone.conf.Debian
+++ b/keystone/files/pike/keystone.conf.Debian
@@ -3122,3 +3122,12 @@
 #driver = sql
 [extra_headers]
 Distribution = Ubuntu
+
+{% if server.extra_config is defined %}
+{%- for section, params in server.extra_config.iteritems() %}
+[{{ section }}]
+{%- for param, value in params.iteritems() %}
+{{ param }} = {{ value }}
+{%- endfor %}
+{%- endfor %}
+{%- endif %}
diff --git a/keystone/files/pike/keystone.conf.RedHat b/keystone/files/pike/keystone.conf.RedHat
index 4ac1dd9..07392f1 100644
--- a/keystone/files/pike/keystone.conf.RedHat
+++ b/keystone/files/pike/keystone.conf.RedHat
@@ -3067,3 +3067,12 @@
 #driver = sql
 [extra_headers]
 Distribution = Ubuntu
+
+{% if server.extra_config is defined %}
+{%- for section, params in server.extra_config.iteritems() %}
+[{{ section }}]
+{%- for param, value in params.iteritems() %}
+{{ param }} = {{ value }}
+{%- endfor %}
+{%- endfor %}
+{%- endif %}
diff --git a/tests/pillar/cluster.sls b/tests/pillar/cluster.sls
index c6d7cc6..bef5d37 100644
--- a/tests/pillar/cluster.sls
+++ b/tests/pillar/cluster.sls
@@ -49,3 +49,6 @@
         description: "Test domain"
         identity:
           list_limit: 20
+    extra_config:
+      federation:
+        cache_group_membership_in_db: true
diff --git a/tests/pillar/single.sls b/tests/pillar/single.sls
index e2721d3..1998406 100644
--- a/tests/pillar/single.sls
+++ b/tests/pillar/single.sls
@@ -28,6 +28,9 @@
       location: /etc/keystone/fernet-keys/
     notification: false
     notification_format: cadf
+    extra_config:
+      federation:
+        cache_group_membership_in_db: true
     #message_queue:
       #engine: rabbitmq
       #host: 127.0.0.1