diff --git a/oslo_templates/files/queens/castellan/_barbican.conf b/oslo_templates/files/queens/castellan/_barbican.conf
new file mode 100644
index 0000000..9068b67
--- /dev/null
+++ b/oslo_templates/files/queens/castellan/_barbican.conf
@@ -0,0 +1,36 @@
+
+#
+# From castellan.config
+#
+
+# Use this endpoint to connect to Barbican, for example:
+# "http://localhost:9311/" (string value)
+#barbican_endpoint = <None>
+
+# Version of the Barbican API, for example: "v1" (string value)
+#barbican_api_version = <None>
+
+# Use this endpoint to connect to Keystone (string value)
+# Deprecated group/name - [key_manager]/auth_url
+#auth_endpoint = http://localhost/identity/v3
+auth_endpoint = {{ _data.get('protocol', 'http') }}://{{ _data.host }}:{{ _data.port }}/v3
+
+# Number of seconds to wait before retrying poll for key creation completion
+# (integer value)
+#retry_delay = 1
+
+# Number of times to retry poll for key creation completion (integer value)
+#number_of_retries = 60
+
+# Specifies if insecure TLS (https) requests. If False, the server's
+# certificate will not be validated (boolean value)
+#verify_ssl = true
+
+# Specifies the type of endpoint.  Allowed values are: public, private, and
+# admin (string value)
+# Possible values:
+# public - <No description provided>
+# internal - <No description provided>
+# admin - <No description provided>
+#barbican_endpoint_type = public
+
diff --git a/oslo_templates/files/queens/keystoneauth/_type_password.conf b/oslo_templates/files/queens/keystoneauth/_type_password.conf
index 8b84cc6..d6f05b7 100644
--- a/oslo_templates/files/queens/keystoneauth/_type_password.conf
+++ b/oslo_templates/files/queens/keystoneauth/_type_password.conf
@@ -49,7 +49,7 @@
 #auth_section = <None>
 
 
-# DECATED: Complete "public" Identity API endpoint. This endpoint should not
+# DEPRICATED: Complete "public" Identity API endpoint. This endpoint should not
 # be an "admin" endpoint, as it should be accessible by all end users.
 # Unauthenticated clients are redirected to this endpoint to authenticate.
 # Although this endpoint should ideally be unversioned, client support in the
diff --git a/oslo_templates/files/queens/oslo/_reports.conf b/oslo_templates/files/queens/oslo/_reports.conf
new file mode 100644
index 0000000..24fdd4d
--- /dev/null
+++ b/oslo_templates/files/queens/oslo/_reports.conf
@@ -0,0 +1,23 @@
+
+#
+# From oslo.reports
+#
+
+# Path to a log directory where to create a file (string value)
+#log_dir = <None>
+{%- if _data.log_dir is defined %}
+log_dir = {{ _data.log_dir }}
+{%- endif %}
+
+# The path to a file to watch for changes to trigger the reports, instead of
+# signals. Setting this option disables the signal trigger for the reports. If
+# application is running as a WSGI application it is recommended to use this
+# instead of signals. (string value)
+#file_event_handler = <None>
+{%- if _data.file_event_handler is defined %}
+file_event_handler = {{ _data.file_event_handler }}
+{%- endif %}
+
+# How many seconds to wait between polls when file_event_handler is set
+# (integer value)
+#file_event_handler_interval = 1
diff --git a/oslo_templates/files/queens/oslo/messaging/_default.conf b/oslo_templates/files/queens/oslo/messaging/_default.conf
index d1231ca..0883fc2 100644
--- a/oslo_templates/files/queens/oslo/messaging/_default.conf
+++ b/oslo_templates/files/queens/oslo/messaging/_default.conf
@@ -174,6 +174,9 @@
 
 # Seconds to wait for a response from a call. (integer value)
 #rpc_response_timeout = 60
+{%- if _data.rpc_response_timeout is defined %}
+rpc_response_timeout = {{ _data.rpc_response_timeout }}
+{%- endif %}
 
 # The network address and optional user credentials for connecting to
 # the messaging backend, in URL format. The expected format is:
@@ -209,4 +212,7 @@
 # overridden by an exchange name specified in the transport_url
 # option. (string value)
 #control_exchange = openstack
+{%- if _data.control_exchange is defined %}
+control_exchange = {{ _data.control_exchange }}
+{%- endif %}
 
diff --git a/tests/pillar/queens/castellan/_barbican.sls b/tests/pillar/queens/castellan/_barbican.sls
new file mode 100644
index 0000000..d22c970
--- /dev/null
+++ b/tests/pillar/queens/castellan/_barbican.sls
@@ -0,0 +1,17 @@
+_data:
+  host: localhost
+  port: 5000
+  default_domain_id: id
+  default_domain_name: name
+  domain_id: id
+  domain_name: name
+  password: password
+  project_domain_name: name
+  project_id: id
+  project_name: name
+  tenant_id: id
+  tenant_name: name
+  user_domain_name: name
+  user_id: id
+  user: user
+  version: v1
diff --git a/tests/pillar/queens/oslo/_reports.sls b/tests/pillar/queens/oslo/_reports.sls
new file mode 100644
index 0000000..edcb1ee
--- /dev/null
+++ b/tests/pillar/queens/oslo/_reports.sls
@@ -0,0 +1,3 @@
+_data:
+  log_dir: /path/to/dir
+  file_event_handler: /path/to/event/handler