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

Proposed by Billy Olsen
Status: Merged
Merged at revision: 197
Proposed branch: lp:~billy-olsen/charms/trusty/nova-compute/1468306
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 90 lines (+28/-0)
6 files modified
hooks/nova_compute_context.py (+13/-0)
templates/icehouse/nova.conf (+3/-0)
templates/juno/nova.conf (+3/-0)
templates/kilo/nova.conf (+2/-0)
templates/mitaka/nova.conf (+2/-0)
templates/parts/cinder (+5/-0)
To merge this branch: bzr merge lp:~billy-olsen/charms/trusty/nova-compute/1468306
Reviewer Review Type Date Requested Status
James Page Needs Fixing
Review via email: mp+286222@code.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
James Page (james-page) wrote :

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

Other than that LGTM.

review: Needs Fixing
194. By Billy Olsen

Merge with next

195. By Billy Olsen

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
248 rid=rid, unit=unit)248 rid=rid, unit=unit)
249 return volume_service249 return volume_service
250250
251 @property
252 def region(self):
253 region = None
254 for rid in relation_ids('cloud-compute'):
255 for unit in related_units(rid):
256 region = relation_get('region', rid=rid, unit=unit)
257 return region
258
251 def flat_dhcp_context(self):259 def flat_dhcp_context(self):
252 ec2_host = None260 ec2_host = None
253 for rid in relation_ids('cloud-compute'):261 for rid in relation_ids('cloud-compute'):
@@ -400,6 +408,11 @@
400408
401 if self.restart_trigger():409 if self.restart_trigger():
402 ctxt['restart_trigger'] = self.restart_trigger()410 ctxt['restart_trigger'] = self.restart_trigger()
411
412 region = self.region
413 if region:
414 ctxt['region'] = region
415
403 return ctxt416 return ctxt
404417
405418
406419
=== 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 @@
113113
114{% if volume_service -%}114{% if volume_service -%}
115volume_api_class = nova.volume.cinder.API115volume_api_class = nova.volume.cinder.API
116{% if region -%}
117os_region_name = {{ region }}
118{% endif -%}
116{% endif -%}119{% endif -%}
117120
118{% if user_config_flags -%}121{% if user_config_flags -%}
119122
=== 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 @@
167{% if disk_cachemodes -%}167{% if disk_cachemodes -%}
168disk_cachemodes = {{ disk_cachemodes }}168disk_cachemodes = {{ disk_cachemodes }}
169{% endif -%}169{% endif -%}
170
171{% include "parts/cinder" %}
172
170173
=== 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 @@
180180
181{% include "section-rabbitmq-oslo" %}181{% include "section-rabbitmq-oslo" %}
182182
183{% include "parts/cinder" %}
184
183[oslo_concurrency]185[oslo_concurrency]
184lock_path=/var/lock/nova186lock_path=/var/lock/nova
185187
186188
=== 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 @@
181181
182{% include "section-rabbitmq-oslo" %}182{% include "section-rabbitmq-oslo" %}
183183
184{% include "parts/cinder" %}
185
184[oslo_concurrency]186[oslo_concurrency]
185lock_path=/var/lock/nova187lock_path=/var/lock/nova
186188
=== 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 @@
1{% if volume_service and volume_service == 'cinder' and region -%}
2[cinder]
3os_region_name = {{ region }}
4{% endif -%}
5

Subscribers

People subscribed via source and target branches