Juju Charms Collection
nova-compute package

Merge lp:~hopem/charms/trusty/nova-compute/lp1548478 into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

  1. Trusty Tahr (14.04)
  2. lp1548478
  3. Merge into next
Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 202
Proposed branch: lp:~hopem/charms/trusty/nova-compute/lp1548478
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 146 lines (+25/-31)
4 files modified
templates/icehouse/nova.conf (+4/-7)
templates/juno/nova.conf (+5/-8)
templates/liberty/nova.conf (+8/-8)
templates/mitaka/nova.conf (+8/-8)
To merge this branch: bzr merge lp:~hopem/charms/trusty/nova-compute/lp1548478
Reviewer Review Type Date Requested Status
Ryan Beisner (community) Approve
Review via email: mp+286833@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 #1173 nova-compute-next for hopem mp286833
    LINT OK: passed

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

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

charm_unit_test #1009 nova-compute-next for hopem mp286833
    UNIT OK: passed

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

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

charm_amulet_test #458 nova-compute-next for hopem mp286833
    AMULET OK: passed

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

Revision history for this message
Ryan Beisner (1chb1n) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'templates/icehouse/nova.conf'
--- templates/icehouse/nova.conf 2016-02-11 22:45:08 +0000
+++ templates/icehouse/nova.conf 2016-02-22 20:15:22 +0000
@@ -155,19 +155,16 @@
155{% if cpu_model -%}155{% if cpu_model -%}
156cpu_model = {{ cpu_model }}156cpu_model = {{ cpu_model }}
157{% endif -%}157{% endif -%}
158{% if libvirt_images_type -%}158{% if libvirt_images_type and rbd_pool -%}
159images_type = {{ libvirt_images_type }}159images_type = {{ libvirt_images_type }}
160images_rbd_pool = {{ rbd_pool }}160images_rbd_pool = {{ rbd_pool }}
161images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}161images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}
162inject_password=false162inject_password = false
163inject_key=false163inject_key = false
164inject_partition=-2164inject_partition = -2
165{% endif -%}165{% endif -%}
166{% if rbd_pool -%}
167rbd_pool = {{ rbd_pool }}
168rbd_user = {{ rbd_user }}166rbd_user = {{ rbd_user }}
169rbd_secret_uuid = {{ rbd_secret_uuid }}167rbd_secret_uuid = {{ rbd_secret_uuid }}
170{% endif -%}
171{% if disk_cachemodes -%}168{% if disk_cachemodes -%}
172disk_cachemodes = {{ disk_cachemodes }}169disk_cachemodes = {{ disk_cachemodes }}
173{% endif -%}170{% endif -%}
174171
=== modified file 'templates/juno/nova.conf'
--- templates/juno/nova.conf 2016-02-11 22:45:08 +0000
+++ templates/juno/nova.conf 2016-02-22 20:15:22 +0000
@@ -148,25 +148,22 @@
148{% if cpu_model -%}148{% if cpu_model -%}
149cpu_model = {{ cpu_model }}149cpu_model = {{ cpu_model }}
150{% endif -%}150{% endif -%}
151{% if libvirt_images_type -%}151{% if libvirt_images_type and rbd_pool -%}
152images_type = {{ libvirt_images_type }}152images_type = {{ libvirt_images_type }}
153images_rbd_pool = {{ rbd_pool }}153images_rbd_pool = {{ rbd_pool }}
154images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}154images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}
155inject_password=false155inject_password = false
156inject_key=false156inject_key = false
157inject_partition=-2157inject_partition = -2
158{% endif -%}158{% endif -%}
159{% if rbd_pool -%}
160rbd_pool = {{ rbd_pool }}
161rbd_user = {{ rbd_user }}159rbd_user = {{ rbd_user }}
162rbd_secret_uuid = {{ rbd_secret_uuid }}160rbd_secret_uuid = {{ rbd_secret_uuid }}
163{% endif -%}
164{% if live_migration_uri -%}161{% if live_migration_uri -%}
165live_migration_uri = {{ live_migration_uri }}162live_migration_uri = {{ live_migration_uri }}
166{% endif -%}163{% endif -%}
167{% if disk_cachemodes -%}164{% if disk_cachemodes -%}
168disk_cachemodes = {{ disk_cachemodes }}165disk_cachemodes = {{ disk_cachemodes }}
169{% endif -%}166{% endif %}
170167
171{% include "parts/cinder" %}168{% include "parts/cinder" %}
172169
173170
=== modified file 'templates/liberty/nova.conf'
--- templates/liberty/nova.conf 2016-02-12 11:10:28 +0000
+++ templates/liberty/nova.conf 2016-02-22 20:15:22 +0000
@@ -162,25 +162,22 @@
162{% if cpu_model -%}162{% if cpu_model -%}
163cpu_model = {{ cpu_model }}163cpu_model = {{ cpu_model }}
164{% endif -%}164{% endif -%}
165{% if libvirt_images_type -%}165{% if libvirt_images_type and rbd_pool -%}
166images_type = {{ libvirt_images_type }}166images_type = {{ libvirt_images_type }}
167images_rbd_pool = {{ rbd_pool }}167images_rbd_pool = {{ rbd_pool }}
168images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}168images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}
169inject_password=false169inject_password = false
170inject_key=false170inject_key = false
171inject_partition=-2171inject_partition = -2
172{% endif -%}172{% endif -%}
173{% if rbd_pool -%}
174rbd_pool = {{ rbd_pool }}
175rbd_user = {{ rbd_user }}173rbd_user = {{ rbd_user }}
176rbd_secret_uuid = {{ rbd_secret_uuid }}174rbd_secret_uuid = {{ rbd_secret_uuid }}
177{% endif -%}
178{% if live_migration_uri -%}175{% if live_migration_uri -%}
179live_migration_uri = {{ live_migration_uri }}176live_migration_uri = {{ live_migration_uri }}
180{% endif -%}177{% endif -%}
181{% if disk_cachemodes -%}178{% if disk_cachemodes -%}
182disk_cachemodes = {{ disk_cachemodes }}179disk_cachemodes = {{ disk_cachemodes }}
183{% endif -%}180{% endif %}
184181
185{% include "parts/section-database" %}182{% include "parts/section-database" %}
186183
@@ -188,3 +185,6 @@
188185
189[oslo_concurrency]186[oslo_concurrency]
190lock_path=/var/lock/nova187lock_path=/var/lock/nova
188
189[workarounds]
190disable_libvirt_livesnapshot = False
191191
=== modified file 'templates/mitaka/nova.conf'
--- templates/mitaka/nova.conf 2016-02-18 12:30:21 +0000
+++ templates/mitaka/nova.conf 2016-02-22 20:15:22 +0000
@@ -163,25 +163,22 @@
163{% if cpu_model -%}163{% if cpu_model -%}
164cpu_model = {{ cpu_model }}164cpu_model = {{ cpu_model }}
165{% endif -%}165{% endif -%}
166{% if libvirt_images_type -%}166{% if libvirt_images_type and rbd_pool -%}
167images_type = {{ libvirt_images_type }}167images_type = {{ libvirt_images_type }}
168images_rbd_pool = {{ rbd_pool }}168images_rbd_pool = {{ rbd_pool }}
169images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}169images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}
170inject_password=false170inject_password = false
171inject_key=false171inject_key = false
172inject_partition=-2172inject_partition = -2
173{% endif -%}173{% endif -%}
174{% if rbd_pool -%}
175rbd_pool = {{ rbd_pool }}
176rbd_user = {{ rbd_user }}174rbd_user = {{ rbd_user }}
177rbd_secret_uuid = {{ rbd_secret_uuid }}175rbd_secret_uuid = {{ rbd_secret_uuid }}
178{% endif -%}
179{% if live_migration_uri -%}176{% if live_migration_uri -%}
180live_migration_uri = {{ live_migration_uri }}177live_migration_uri = {{ live_migration_uri }}
181{% endif -%}178{% endif -%}
182{% if disk_cachemodes -%}179{% if disk_cachemodes -%}
183disk_cachemodes = {{ disk_cachemodes }}180disk_cachemodes = {{ disk_cachemodes }}
184{% endif -%}181{% endif %}
185182
186{% include "parts/section-database" %}183{% include "parts/section-database" %}
187184
@@ -191,3 +188,6 @@
191188
192[oslo_concurrency]189[oslo_concurrency]
193lock_path=/var/lock/nova190lock_path=/var/lock/nova
191
192[workarounds]
193disable_libvirt_livesnapshot = False

Subscribers

People subscribed via source and target branches