diff --git a/manifests/config.pp b/manifests/config.pp
new file mode 100644
index 00000000..2425fa4f
--- /dev/null
+++ b/manifests/config.pp
@@ -0,0 +1,30 @@
+# == Class: heat::config
+#
+# This class is used to manage arbitrary Heat configurations.
+#
+# === Parameters
+#
+# [*heat_config*]
+#   (optional) Allow configuration of arbitrary Heat configurations.
+#   The value is an hash of heat_config resources. Example:
+#   { 'DEFAULT/foo' => { value => 'fooValue'},
+#     'DEFAULT/bar' => { value => 'barValue'}
+#   }
+#   In yaml format, Example:
+#   heat_config:
+#     DEFAULT/foo:
+#       value: fooValue
+#     DEFAULT/bar:
+#       value: barValue
+#
+#   NOTE: The configuration MUST NOT be already handled by this module
+#   or Puppet catalog compilation will fail with duplicate resources.
+#
+class heat::config (
+  $heat_config = {},
+) {
+
+  validate_hash($heat_config)
+
+  create_resources('heat_config', $heat_config)
+}
diff --git a/spec/classes/heat_config_spec.rb b/spec/classes/heat_config_spec.rb
new file mode 100644
index 00000000..9a1bf273
--- /dev/null
+++ b/spec/classes/heat_config_spec.rb
@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe 'heat::config' do
+
+  let :params do
+    { :heat_config => {
+        'DEFAULT/foo' => { 'value'  => 'fooValue' },
+        'DEFAULT/bar' => { 'value'  => 'barValue' },
+        'DEFAULT/baz' => { 'ensure' => 'absent' }
+      }
+    }
+  end
+
+  it 'configures arbitrary heat configurations' do
+    is_expected.to contain_heat_config('DEFAULT/foo').with_value('fooValue')
+    is_expected.to contain_heat_config('DEFAULT/bar').with_value('barValue')
+    is_expected.to contain_heat_config('DEFAULT/baz').with_ensure('absent')
+  end
+
+end