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

[Billy Olsen]

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

charm_lint_check #661 nova-compute-next for billy-olsen mp286222
    LINT OK: passed

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

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

charm_unit_test #572 nova-compute-next for billy-olsen mp286222
    UNIT OK: passed

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

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

charm_amulet_test #268 nova-compute-next for billy-olsen mp286222
    AMULET OK: passed

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

[James Page (james-page)]

Please can you rebase and add the same snippet to the mitaka template - thanks!

Other than that LGTM.

review: Needs Fixing

[lp:~billy-olsen/charms/trusty/nova-compute/1468306]

194. By Billy Olsen on 2016-02-17

Merge with next

195. By Billy Olsen on 2016-02-17

Add cinder's snippet to mitaka's nova.conf

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

charm_lint_check #750 nova-compute-next for billy-olsen mp286222
    LINT OK: passed

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

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

charm_unit_test #656 nova-compute-next for billy-olsen mp286222
    UNIT OK: passed

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

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

charm_amulet_test #304 nova-compute-next for billy-olsen mp286222
    AMULET OK: passed

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

=== modified file 'hooks/nova_compute_context.py'
--- hooks/nova_compute_context.py	2015-11-10 13:39:24 +0000
+++ hooks/nova_compute_context.py	2016-02-17 17:26:54 +0000
@@ -248,6 +248,14 @@
                                               rid=rid, unit=unit)
         return volume_service
 
+    @property
+    def region(self):
+        region = None
+        for rid in relation_ids('cloud-compute'):
+            for unit in related_units(rid):
+                region = relation_get('region', rid=rid, unit=unit)
+        return region
+
     def flat_dhcp_context(self):
         ec2_host = None
         for rid in relation_ids('cloud-compute'):
@@ -400,6 +408,11 @@
 
         if self.restart_trigger():
             ctxt['restart_trigger'] = self.restart_trigger()
+
+        region = self.region
+        if region:
+            ctxt['region'] = region
+
         return ctxt
 
 

=== modified file 'templates/icehouse/nova.conf'
--- templates/icehouse/nova.conf	2015-09-25 14:58:23 +0000
+++ templates/icehouse/nova.conf	2016-02-17 17:26:54 +0000
@@ -113,6 +113,9 @@
 
 {% if volume_service -%}
 volume_api_class = nova.volume.cinder.API
+{% if region -%}
+os_region_name = {{ region }}
+{% endif -%}
 {% endif -%}
 
 {% if user_config_flags -%}

=== modified file 'templates/juno/nova.conf'
--- templates/juno/nova.conf	2015-10-14 14:08:38 +0000
+++ templates/juno/nova.conf	2016-02-17 17:26:54 +0000
@@ -167,3 +167,6 @@
 {% if disk_cachemodes -%}
 disk_cachemodes = {{ disk_cachemodes }}
 {% endif -%}
+
+{% include "parts/cinder" %}
+

=== modified file 'templates/kilo/nova.conf'
--- templates/kilo/nova.conf	2016-02-09 13:52:08 +0000
+++ templates/kilo/nova.conf	2016-02-17 17:26:54 +0000
@@ -180,6 +180,8 @@
 
 {% include "section-rabbitmq-oslo" %}
 
+{% include "parts/cinder" %}
+
 [oslo_concurrency]
 lock_path=/var/lock/nova
 

=== modified file 'templates/mitaka/nova.conf'
--- templates/mitaka/nova.conf	2016-02-12 12:03:15 +0000
+++ templates/mitaka/nova.conf	2016-02-17 17:26:54 +0000
@@ -181,5 +181,7 @@
 
 {% include "section-rabbitmq-oslo" %}
 
+{% include "parts/cinder" %}
+
 [oslo_concurrency]
 lock_path=/var/lock/nova

=== added file 'templates/parts/cinder'
--- templates/parts/cinder	1970-01-01 00:00:00 +0000
+++ templates/parts/cinder	2016-02-17 17:26:54 +0000
@@ -0,0 +1,5 @@
+{% if volume_service and volume_service == 'cinder' and region -%}
+[cinder]
+os_region_name = {{ region }}
+{% endif -%}
+