diff --git a/README.rst b/README.rst
index e14d670..b9058f1 100644
--- a/README.rst
+++ b/README.rst
@@ -16,6 +16,7 @@
       server:
         enabled: true
         version: icehouse
+        region: RegionOne
         bind:
           metadata:
             address: 10.0.106.10
diff --git a/heat/files/kilo/heat.conf.Debian b/heat/files/kilo/heat.conf.Debian
index 9c22b1f..6fab1b7 100644
--- a/heat/files/kilo/heat.conf.Debian
+++ b/heat/files/kilo/heat.conf.Debian
@@ -5,6 +5,8 @@
 # From oslo.log
 #
 
+region_name_for_services={{ server.region }}
+
 # Print debugging output (set logging level to DEBUG instead of default WARNING
 # level). (boolean value)
 #debug = false
diff --git a/heat/files/liberty/heat.conf.Debian b/heat/files/liberty/heat.conf.Debian
index 9c22b1f..6fab1b7 100644
--- a/heat/files/liberty/heat.conf.Debian
+++ b/heat/files/liberty/heat.conf.Debian
@@ -5,6 +5,8 @@
 # From oslo.log
 #
 
+region_name_for_services={{ server.region }}
+
 # Print debugging output (set logging level to DEBUG instead of default WARNING
 # level). (boolean value)
 #debug = false
diff --git a/metadata/service/server/cluster.yml b/metadata/service/server/cluster.yml
index adf8e66..b688139 100644
--- a/metadata/service/server/cluster.yml
+++ b/metadata/service/server/cluster.yml
@@ -10,6 +10,7 @@
         password: ${_param:heat_domain_admin_password}
         domain: heat
       enabled: true
+      region: RegionOne
       version: ${_param:heat_version}
       bind:
         api_cfn:
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index 9d07057..082e429 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -10,6 +10,7 @@
         password: ${_param:heat_domain_admin_password}
         domain: heat
       enabled: true
+      region: RegionOne
       version: ${_param:heat_version}
       bind:
         api_cfn:
diff --git a/other-requirements.txt b/other-requirements.txt
new file mode 100644
index 0000000..ba84cc5
--- /dev/null
+++ b/other-requirements.txt
@@ -0,0 +1 @@
+python-yaml
diff --git a/tests/pillar/server_cluster.sls b/tests/pillar/server_cluster.sls
index 7e917b7..ef6a978 100644
--- a/tests/pillar/server_cluster.sls
+++ b/tests/pillar/server_cluster.sls
@@ -1,6 +1,7 @@
 heat:
   server:
     enabled: true
+    region: RegionOne
     version: liberty
     stack_domain_admin:
       name: heat_domain_admin
diff --git a/tests/pillar/server_single.sls b/tests/pillar/server_single.sls
index dd679a2..667fc69 100644
--- a/tests/pillar/server_single.sls
+++ b/tests/pillar/server_single.sls
@@ -1,6 +1,7 @@
 heat:
   server:
     enabled: true
+    region: RegionOne
     version: liberty
     stack_domain_admin:
       name: heat_domain_admin