add region configuration from pillar data

Change-Id: I93a56b3ed6243a85962313876ca53ba7c916b093

ceilometer/files/liberty/ceilometer-agent.conf.Debian

@@ -498,7 +498,7 @@ os_auth_url=http://{{ agent.identity.host }}:5000/v2.0
 # Region name to use for OpenStack service endpoints. (string
 # value)
 #os_region_name=<None>
-os_region_name=RegionOne
+os_region_name={{ agent.get('region', 'RegionOne') }}
 
 # Type of endpoint in Identity service catalog to use for
 # communication with OpenStack services. (string value)

ceilometer/files/liberty/ceilometer-server.conf.Debian

@@ -596,6 +596,7 @@ rabbit_virtual_host = {{ server.message_queue.virtual_host }}
 # Options defined in ceilometer.service
 #
 
+
 # User name to use for OpenStack service access. (string
 # value)
 #os_username=ceilometer
@@ -624,7 +625,7 @@ os_auth_url=http://{{ server.identity.host }}:5000/v2.0
 # Region name to use for OpenStack service endpoints. (string
 # value)
 #os_region_name=<None>
-os_region_name=RegionOne
+os_region_name={{ agent.get('region', 'RegionOne') }}
 
 # Type of endpoint in Identity service catalog to use for
 # communication with OpenStack services. (string value)

tests/pillar/agent_cluster.sls

@@ -1,5 +1,6 @@
 ceilometer:
   agent:
+    region: RegionOne
     enabled: true
     version: liberty
     secret: password

tests/pillar/agent_single.sls

@@ -1,5 +1,6 @@
 ceilometer:
   agent:
+    #region: RegionOne
     enabled: true
     version: liberty
     secret: password

tests/pillar/server_cluster.sls

@@ -1,5 +1,6 @@
 ceilometer:
   server:
+    region: RegionOne
     enabled: true
     version: liberty
     cluster: true

tests/pillar/server_single.sls

@@ -1,5 +1,6 @@
 ceilometer:
   server:
+    #region: RegionOne
     enabled: true
     version: liberty
     secret: password