Merge lp:~billy-olsen/charms/trusty/cinder/1468306 into lp:~openstack-charmers-archive/charms/trusty/cinder/next

[Billy Olsen]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #663 cinder-next for billy-olsen mp286223
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/663/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #570 cinder-next for billy-olsen mp286223
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/570/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #270 cinder-next for billy-olsen mp286223
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/270/

[James Page (james-page)]

review: Approve

=== modified file 'hooks/cinder_contexts.py'
--- hooks/cinder_contexts.py	2015-09-30 11:07:30 +0000
+++ hooks/cinder_contexts.py	2016-02-16 18:51:03 +0000
@@ -154,3 +154,18 @@
                 "backends configured.", level=WARNING)
 
         return ctxt
+
+
+class RegionContext(OSContextGenerator):
+    """Provides context data regarding the region the service is in.
+
+    This context provides the region that is configured by the admin via the
+    region option in the config settings for the charm. If no region config
+    is available, then this will provide an empty context.
+    """
+    def __call__(self):
+        region = config('region')
+        if region:
+            return {'region': region}
+        else:
+            return {}

=== modified file 'hooks/cinder_utils.py'
--- hooks/cinder_utils.py	2016-01-06 21:17:12 +0000
+++ hooks/cinder_utils.py	2016-02-16 18:51:03 +0000
@@ -203,7 +203,8 @@
                               service='cinder',
                               service_user='cinder'),
                           context.BindHostContext(),
-                          context.WorkerConfigContext()],
+                          context.WorkerConfigContext(),
+                          cinder_contexts.RegionContext()],
         'services': ['cinder-api', 'cinder-volume', 'cinder-backup',
                      'cinder-scheduler', 'haproxy']
     }),

=== modified file 'templates/cinder.conf'
--- templates/cinder.conf	2014-04-12 19:12:09 +0000
+++ templates/cinder.conf	2016-02-16 18:51:03 +0000
@@ -57,6 +57,10 @@
 glance_api_version = {{ glance_api_version }}
 {% endif -%}
 
+{% if region -%}
+os_region_name = {{ region }}
+{% endif -%}
+
 {% if user_config_flags -%}
 {% for key, value in user_config_flags.iteritems() -%}
 {{ key }} = {{ value }}

=== modified file 'templates/icehouse/cinder.conf'
--- templates/icehouse/cinder.conf	2015-02-19 19:37:26 +0000
+++ templates/icehouse/cinder.conf	2016-02-16 18:51:03 +0000
@@ -48,6 +48,10 @@
 glance_api_version = {{ glance_api_version }}
 {% endif -%}
 
+{% if region -%}
+os_region_name = {{ region }}
+{% endif -%}
+
 {% if user_config_flags -%}
 {% for key, value in user_config_flags.iteritems() -%}
 {{ key }} = {{ value }}

=== modified file 'templates/kilo/cinder.conf'
--- templates/kilo/cinder.conf	2015-12-15 10:20:01 +0000
+++ templates/kilo/cinder.conf	2016-02-16 18:51:03 +0000
@@ -45,6 +45,10 @@
 glance_api_version = {{ glance_api_version }}
 {% endif -%}
 
+{% if region -%}
+os_region_name = {{ region }}
+{% endif -%}
+
 {% if user_config_flags -%}
 {% for key, value in user_config_flags.iteritems() -%}
 {{ key }} = {{ value }}

=== modified file 'unit_tests/test_cinder_contexts.py'
--- unit_tests/test_cinder_contexts.py	2015-09-11 10:36:23 +0000
+++ unit_tests/test_cinder_contexts.py	2016-02-16 18:51:03 +0000
@@ -341,3 +341,8 @@
                                    u'cinder.volume.drivers.OtherDriver']]}}
 
         self.assertEquals(ctxt, exp)
+
+    def test_region_context(self):
+        self.config.return_value = 'two'
+        ctxt = contexts.RegionContext()()
+        self.assertEqual('two', ctxt['region'])