diff --git a/README.rst b/README.rst
index d43206c..2ed2f57 100644
--- a/README.rst
+++ b/README.rst
@@ -268,6 +268,23 @@
             name: test.zone.
             email: admin@test.zone
 
+Change default options using configmap template settings
+========================================================
+
+.. code-block:: yaml
+
+    designate:
+      server:
+        configmap:
+          DEFAULT:
+            default_soa_refresh_min: 3500
+            default_soa_refresh_max: 3600
+            default_soa_minimum: 3600
+          'network_api:neutron':
+            admin_username: admin
+            admin_password: password
+            admin_tenant_name: tenant1
+
 Upgrades
 ========
 
diff --git a/designate/files/ocata/designate.conf.Debian b/designate/files/ocata/designate.conf.Debian
index 89ed2ca..65857fc 100644
--- a/designate/files/ocata/designate.conf.Debian
+++ b/designate/files/ocata/designate.conf.Debian
@@ -651,3 +651,8 @@
 {%- if server.identity.get('protocol', 'http') == 'https' %}
 cafile = {{ server.identity.get('cacert_file', server.cacert_file)  }}
 {%- endif %}
+
+{%- if server.configmap is defined %}
+{%- set _data = server.configmap %}
+{%- include "oslo_templates/files/configmap/configmap.conf" %}
+{%- endif %}
diff --git a/designate/files/pike/designate.conf.Debian b/designate/files/pike/designate.conf.Debian
index ac3b91b..d0283b6 100644
--- a/designate/files/pike/designate.conf.Debian
+++ b/designate/files/pike/designate.conf.Debian
@@ -665,3 +665,8 @@
 {%- if server.identity.get('protocol', 'http') == 'https' %}
 cafile = {{ server.identity.get('cacert_file', server.cacert_file)  }}
 {%- endif %}
+
+{%- if server.configmap is defined %}
+{%- set _data = server.configmap %}
+{%- include "oslo_templates/files/configmap/configmap.conf" %}
+{%- endif %}
diff --git a/designate/files/queens/designate.conf.Debian b/designate/files/queens/designate.conf.Debian
index f27c6b8..854a7c1 100644
--- a/designate/files/queens/designate.conf.Debian
+++ b/designate/files/queens/designate.conf.Debian
@@ -1058,3 +1058,8 @@
 {%- if 'cacert_file' not in server.database.ssl.keys() %}{% do _data['ssl'].update({'cacert_file': server.cacert_file}) %}{% endif %}
 {%- endif %}
 {%- include "oslo_templates/files/queens/oslo/_database.conf" %}
+
+{%- if server.configmap is defined %}
+{%- set _data = server.configmap %}
+{%- include "oslo_templates/files/configmap/configmap.conf" %}
+{%- endif %}
diff --git a/tests/integration/ocata/server_cluster/config_spec.rb b/tests/integration/ocata/server_cluster/config_spec.rb
index 9330b40..714f7b2 100644
--- a/tests/integration/ocata/server_cluster/config_spec.rb
+++ b/tests/integration/ocata/server_cluster/config_spec.rb
@@ -24,6 +24,18 @@
   'formatv6'            => "'%(hostname)s.%(zone)s'",
 }
 
+section1 = {
+  'default_soa_refresh_min' => '3500',
+  'default_soa_refresh_max' => '3600',
+  'default_soa_minimum'     => '3600',
+}
+
+section2_subsection1 = {
+  'admin_username'    => 'admin',
+  'admin_password'    => 'password',
+  'admin_tenant_name' => 'tenant1',
+}
+
 control 'Designate' do
 
   describe parse_config_file('/etc/designate/designate.conf') do
@@ -59,5 +71,18 @@
       end
 
     end
+
+    describe 'Custom configmap settings' do
+
+      its('section1') do
+        should include(section1)
+      end
+
+      its('section2:subsection1') do
+        should include(section2_subsection1)
+      end
+
+    end
+
   end
-end
\ No newline at end of file
+end
diff --git a/tests/integration/ocata/server_single/config_spec.rb b/tests/integration/ocata/server_single/config_spec.rb
index 6ffe944..21147bb 100644
--- a/tests/integration/ocata/server_single/config_spec.rb
+++ b/tests/integration/ocata/server_single/config_spec.rb
@@ -25,6 +25,18 @@
   'formatv6'            => "'%(hostname)s.%(zone)s'",
 }
 
+section1 = {
+  'default_soa_refresh_min' => '3500',
+  'default_soa_refresh_max' => '3600',
+  'default_soa_minimum'     => '3600',
+}
+
+section2_subsection1 = {
+  'admin_username'    => 'admin',
+  'admin_password'    => 'password',
+  'admin_tenant_name' => 'tenant1',
+}
+
 control 'Designate' do
 
   describe parse_config_file('/etc/designate/designate.conf') do
@@ -61,5 +73,17 @@
 
     end
 
+    describe 'Custom configmap settings' do
+
+      its('section1') do
+        should include(section1)
+      end
+
+      its('section2:subsection1') do
+        should include(section2_subsection1)
+      end
+
+    end
+
   end
-end
\ No newline at end of file
+end
diff --git a/tests/integration/pike/server_cluster/config_spec.rb b/tests/integration/pike/server_cluster/config_spec.rb
index 870ac21..f9746c0 100644
--- a/tests/integration/pike/server_cluster/config_spec.rb
+++ b/tests/integration/pike/server_cluster/config_spec.rb
@@ -31,6 +31,18 @@
   'formatv6'            => "'%(hostname)s.%(zone)s'",
 }
 
+section1 = {
+  'default_soa_refresh_min' => '3500',
+  'default_soa_refresh_max' => '3600',
+  'default_soa_minimum'     => '3600',
+}
+
+section2_subsection1 = {
+  'admin_username'    => 'admin',
+  'admin_password'    => 'password',
+  'admin_tenant_name' => 'tenant1',
+}
+
 control 'Designate' do
 
   describe parse_config_file('/etc/designate/designate.conf') do
@@ -69,5 +81,17 @@
       end
 
     end
+
+    describe 'Custom configmap settings' do
+
+      its('section1') do
+        should include(section1)
+      end
+
+      its('section2:subsection1') do
+        should include(section2_subsection1)
+      end
+
+    end
   end
-end
\ No newline at end of file
+end
diff --git a/tests/integration/pike/server_single/config_spec.rb b/tests/integration/pike/server_single/config_spec.rb
index c872c61..3a5fdff 100644
--- a/tests/integration/pike/server_single/config_spec.rb
+++ b/tests/integration/pike/server_single/config_spec.rb
@@ -31,6 +31,18 @@
   'formatv6'            => "'%(hostname)s.%(zone)s'",
 }
 
+section1 = {
+  'default_soa_refresh_min' => '3500',
+  'default_soa_refresh_max' => '3600',
+  'default_soa_minimum'     => '3600',
+}
+
+section2_subsection1 = {
+  'admin_username'    => 'admin',
+  'admin_password'    => 'password',
+  'admin_tenant_name' => 'tenant1',
+}
+
 control 'Designate' do
 
   describe parse_config_file('/etc/designate/designate.conf') do
@@ -69,5 +81,18 @@
       end
 
     end
+
+    describe 'Custom configmap settings' do
+
+      its('section1') do
+        should include(section1)
+      end
+
+      its('section2:subsection1') do
+        should include(section2_subsection1)
+      end
+
+    end
+
   end
-end
\ No newline at end of file
+end
diff --git a/tests/integration/queens/server_cluster/config_spec.rb b/tests/integration/queens/server_cluster/config_spec.rb
index 6c5a738..967f1fe 100644
--- a/tests/integration/queens/server_cluster/config_spec.rb
+++ b/tests/integration/queens/server_cluster/config_spec.rb
@@ -31,6 +31,18 @@
   'formatv4' => "'%(octet0)s-%(octet1)s-%(octet2)s-%(octet3)s.%(zone)s'",
 }
 
+section1 = {
+  'default_soa_refresh_min' => '3500',
+  'default_soa_refresh_max' => '3600',
+  'default_soa_minimum'     => '3600',
+}
+
+section2_subsection1 = {
+  'admin_username'    => 'admin',
+  'admin_password'    => 'password',
+  'admin_tenant_name' => 'tenant1',
+}
+
 control 'Designate' do
 
   describe parse_config_file('/etc/designate/designate.conf') do
@@ -73,5 +85,18 @@
       end
 
     end
+
+    describe 'Custom configmap settings' do
+
+      its('section1') do
+        should include(section1)
+      end
+
+      its('section2:subsection1') do
+        should include(section2_subsection1)
+      end
+
+    end
+
   end
-end
\ No newline at end of file
+end
diff --git a/tests/integration/queens/server_single/config_spec.rb b/tests/integration/queens/server_single/config_spec.rb
index ee8ca13..4d9f8ae 100644
--- a/tests/integration/queens/server_single/config_spec.rb
+++ b/tests/integration/queens/server_single/config_spec.rb
@@ -31,6 +31,18 @@
   'formatv4' => "'%(octet0)s-%(octet1)s-%(octet2)s-%(octet3)s.%(zone)s'",
 }
 
+section1 = {
+  'default_soa_refresh_min' => '3500',
+  'default_soa_refresh_max' => '3600',
+  'default_soa_minimum'     => '3600',
+}
+
+section2_subsection1 = {
+  'admin_username'    => 'admin',
+  'admin_password'    => 'password',
+  'admin_tenant_name' => 'tenant1',
+}
+
 control 'Designate' do
 
   describe parse_config_file('/etc/designate/designate.conf') do
@@ -73,5 +85,18 @@
       end
 
     end
+
+    describe 'Custom configmap settings' do
+
+      its('section1') do
+        should include(section1)
+      end
+
+      its('section2:subsection1') do
+        should include(section2_subsection1)
+      end
+
+    end
+
   end
-end
\ No newline at end of file
+end
diff --git a/tests/integration/rocky/server_cluster/config_spec.rb b/tests/integration/rocky/server_cluster/config_spec.rb
new file mode 100644
index 0000000..967f1fe
--- /dev/null
+++ b/tests/integration/rocky/server_cluster/config_spec.rb
@@ -0,0 +1,102 @@
+ssl_enabled = attribute("ssl", default: false)
+
+oslo_messaging_default_ssl = {
+  'transport_url' => 'rabbit://openstack:password@127.0.0.1:5671,openstack:password@127.0.0.2:5671,openstack:password@127.0.0.3:5671//openstack'
+}
+
+oslo_messaging_rabbit_ssl = {
+  'ssl'         => 'true',
+  'ssl_version' => 'TLSv1_2',
+  'ssl_ca_file' => '/etc/designate/ssl/mysql/ca-cert.pem',
+}
+
+oslo_messaging_default = {
+  'transport_url' => 'rabbit://openstack:password@127.0.0.1:5672,openstack:password@127.0.0.2:5672,openstack:password@127.0.0.3:5672//openstack'
+}
+
+oslo_messaging_rabbit = {}
+
+service_sink = {
+  'enabled_notification_handlers' => 'neutron_floatingip, nova_fixed'
+}
+
+handler_nova_fixed = {
+  'zone_id'  => '5186883b-91fb-4891-bd49-e6769234a8fc',
+  'formatv4' => "'%(hostname)s.%(zone)s'",
+  'formatv6' => "'%(hostname)s.%(zone)s'",
+}
+
+handler_neutron_floatingip = {
+  'zone_id'  => '5186883b-91fb-4891-bd49-e6769234a8fc',
+  'formatv4' => "'%(octet0)s-%(octet1)s-%(octet2)s-%(octet3)s.%(zone)s'",
+}
+
+section1 = {
+  'default_soa_refresh_min' => '3500',
+  'default_soa_refresh_max' => '3600',
+  'default_soa_minimum'     => '3600',
+}
+
+section2_subsection1 = {
+  'admin_username'    => 'admin',
+  'admin_password'    => 'password',
+  'admin_tenant_name' => 'tenant1',
+}
+
+control 'Designate' do
+
+  describe parse_config_file('/etc/designate/designate.conf') do
+
+    describe 'Designate messaging' do
+
+      if ssl_enabled
+        oslo_messaging_default.merge!(oslo_messaging_default_ssl)
+        oslo_messaging_rabbit.merge!(oslo_messaging_rabbit_ssl)
+        describe 'SSL' do
+          its('DEFAULT') {
+            should include(oslo_messaging_default)
+          }
+          its('oslo_messaging_rabbit') {
+            should include(oslo_messaging_rabbit)
+          }
+        end
+      else
+        describe 'non SSL' do
+          its('DEFAULT') do
+            should include(oslo_messaging_default)
+          end
+        end
+      end
+
+    end
+
+    describe 'Designate notification handlers' do
+
+      its('service:sink') do
+        should include(service_sink)
+      end
+
+      its('handler:nova_fixed') do
+        should include(handler_nova_fixed)
+      end
+
+      its('handler:neutron_floatingip') do
+        should include(handler_neutron_floatingip)
+      end
+
+    end
+
+    describe 'Custom configmap settings' do
+
+      its('section1') do
+        should include(section1)
+      end
+
+      its('section2:subsection1') do
+        should include(section2_subsection1)
+      end
+
+    end
+
+  end
+end
diff --git a/tests/integration/rocky/server_single/config_spec.rb b/tests/integration/rocky/server_single/config_spec.rb
new file mode 100644
index 0000000..4d9f8ae
--- /dev/null
+++ b/tests/integration/rocky/server_single/config_spec.rb
@@ -0,0 +1,102 @@
+ssl_enabled = attribute("ssl", default: false)
+
+oslo_messaging_default_ssl = {
+  'transport_url' => 'rabbit://openstack:password@127.0.0.1:5671//openstack'
+}
+
+oslo_messaging_rabbit_ssl = {
+  'ssl'         => 'true',
+  'ssl_version' => 'TLSv1_2',
+  'ssl_ca_file' => '/etc/designate/ssl/mysql/ca-cert.pem',
+}
+
+oslo_messaging_default = {
+  'transport_url' => 'rabbit://openstack:password@127.0.0.1:5672//openstack'
+}
+
+oslo_messaging_rabbit = {}
+
+service_sink = {
+  'enabled_notification_handlers' => 'neutron_floatingip, nova_fixed'
+}
+
+handler_nova_fixed = {
+  'zone_id'  => '5186883b-91fb-4891-bd49-e6769234a8fc',
+  'formatv4' => "'%(hostname)s.%(zone)s'",
+  'formatv6' => "'%(hostname)s.%(zone)s'",
+}
+
+handler_neutron_floatingip = {
+  'zone_id'  => '5186883b-91fb-4891-bd49-e6769234a8fc',
+  'formatv4' => "'%(octet0)s-%(octet1)s-%(octet2)s-%(octet3)s.%(zone)s'",
+}
+
+section1 = {
+  'default_soa_refresh_min' => '3500',
+  'default_soa_refresh_max' => '3600',
+  'default_soa_minimum'     => '3600',
+}
+
+section2_subsection1 = {
+  'admin_username'    => 'admin',
+  'admin_password'    => 'password',
+  'admin_tenant_name' => 'tenant1',
+}
+
+control 'Designate' do
+
+  describe parse_config_file('/etc/designate/designate.conf') do
+
+    describe 'Designate messaging' do
+
+      if ssl_enabled
+        oslo_messaging_default.merge!(oslo_messaging_default_ssl)
+        oslo_messaging_rabbit.merge!(oslo_messaging_rabbit_ssl)
+        describe 'SSL' do
+          its('DEFAULT') {
+            should include(oslo_messaging_default)
+          }
+          its('oslo_messaging_rabbit') {
+            should include(oslo_messaging_rabbit)
+          }
+        end
+      else
+        describe 'non SSL' do
+          its('DEFAULT') do
+            should include(oslo_messaging_default)
+          end
+        end
+      end
+
+    end
+
+    describe 'Designate notification handlers' do
+
+      its('service:sink') do
+        should include(service_sink)
+      end
+
+      its('handler:nova_fixed') do
+        should include(handler_nova_fixed)
+      end
+
+      its('handler:neutron_floatingip') do
+        should include(handler_neutron_floatingip)
+      end
+
+    end
+
+    describe 'Custom configmap settings' do
+
+      its('section1') do
+        should include(section1)
+      end
+
+      its('section2:subsection1') do
+        should include(section2_subsection1)
+      end
+
+    end
+
+  end
+end
diff --git a/tests/pillar/repo_mcp_openstack_rocky.sls b/tests/pillar/repo_mcp_openstack_rocky.sls
new file mode 100644
index 0000000..cb1c5b1
--- /dev/null
+++ b/tests/pillar/repo_mcp_openstack_rocky.sls
@@ -0,0 +1,12 @@
+linux:
+  system:
+    enabled: true
+    repo:
+      mirantis_openstack_repo:
+        source: "deb http://mirror.mirantis.com/nightly/openstack-rocky/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
+        architectures: amd64
+        key_url: "http://mirror.mirantis.com/nightly/openstack-rocky/{{ grains.get('oscodename') }}/archive-openstack-rocky.key"
+        pin:
+        - pin: 'release l=rocky'
+          priority: 1050
+          package: '*'
diff --git a/tests/pillar/server_cluster.sls b/tests/pillar/server_cluster.sls
index 2313ef7..4a3a74e 100644
--- a/tests/pillar/server_cluster.sls
+++ b/tests/pillar/server_cluster.sls
@@ -86,6 +86,19 @@
             port: 53
     quota:
       zones: 40
+    configmap:
+      # Inspec framework used for kitchen integration tests
+      # doesn't support merging of section with identical names
+      # in ini files, to unblock patches it was decided to use
+      # custom names section names here
+      section1:
+        default_soa_refresh_min: 3500
+        default_soa_refresh_max: 3600
+        default_soa_minimum: 3600
+      'section2:subsection1':
+        admin_username: admin
+        admin_password: password
+        admin_tenant_name: tenant1
   worker:
     enabled: true
     logging:
@@ -96,4 +109,4 @@
         fluentd:
           enabled: false
         ossyslog:
-          enabled: false
\ No newline at end of file
+          enabled: false
diff --git a/tests/pillar/server_single.sls b/tests/pillar/server_single.sls
index ea81a3b..e744f15 100644
--- a/tests/pillar/server_single.sls
+++ b/tests/pillar/server_single.sls
@@ -84,6 +84,19 @@
             port: 53
     quota:
       zones: 40
+    configmap:
+      # Inspec framework used for kitchen integration tests
+      # doesn't support merging of section with identical names
+      # in ini files, to unblock patches it was decided to use
+      # custom names section names here
+      section1:
+        default_soa_refresh_min: 3500
+        default_soa_refresh_max: 3600
+        default_soa_minimum: 3600
+      'section2:subsection1':
+        admin_username: admin
+        admin_password: password
+        admin_tenant_name: tenant1
   worker:
     enabled: true
     logging:
@@ -94,4 +107,4 @@
         fluentd:
           enabled: false
         ossyslog:
-          enabled: false
\ No newline at end of file
+          enabled: false