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

Proposed by Edward Hope-Morley on 2016-02-22
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 2016-02-22 Approve on 2016-02-22
Review via email: mp+286833@code.launchpad.net
To post a comment you must log in.

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/

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/

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/

Ryan Beisner (1chb1n) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/icehouse/nova.conf'
2--- templates/icehouse/nova.conf 2016-02-11 22:45:08 +0000
3+++ templates/icehouse/nova.conf 2016-02-22 20:15:22 +0000
4@@ -155,19 +155,16 @@
5 {% if cpu_model -%}
6 cpu_model = {{ cpu_model }}
7 {% endif -%}
8-{% if libvirt_images_type -%}
9+{% if libvirt_images_type and rbd_pool -%}
10 images_type = {{ libvirt_images_type }}
11 images_rbd_pool = {{ rbd_pool }}
12 images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}
13-inject_password=false
14-inject_key=false
15-inject_partition=-2
16+inject_password = false
17+inject_key = false
18+inject_partition = -2
19 {% endif -%}
20-{% if rbd_pool -%}
21-rbd_pool = {{ rbd_pool }}
22 rbd_user = {{ rbd_user }}
23 rbd_secret_uuid = {{ rbd_secret_uuid }}
24-{% endif -%}
25 {% if disk_cachemodes -%}
26 disk_cachemodes = {{ disk_cachemodes }}
27 {% endif -%}
28
29=== modified file 'templates/juno/nova.conf'
30--- templates/juno/nova.conf 2016-02-11 22:45:08 +0000
31+++ templates/juno/nova.conf 2016-02-22 20:15:22 +0000
32@@ -148,25 +148,22 @@
33 {% if cpu_model -%}
34 cpu_model = {{ cpu_model }}
35 {% endif -%}
36-{% if libvirt_images_type -%}
37+{% if libvirt_images_type and rbd_pool -%}
38 images_type = {{ libvirt_images_type }}
39 images_rbd_pool = {{ rbd_pool }}
40 images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}
41-inject_password=false
42-inject_key=false
43-inject_partition=-2
44+inject_password = false
45+inject_key = false
46+inject_partition = -2
47 {% endif -%}
48-{% if rbd_pool -%}
49-rbd_pool = {{ rbd_pool }}
50 rbd_user = {{ rbd_user }}
51 rbd_secret_uuid = {{ rbd_secret_uuid }}
52-{% endif -%}
53 {% if live_migration_uri -%}
54 live_migration_uri = {{ live_migration_uri }}
55 {% endif -%}
56 {% if disk_cachemodes -%}
57 disk_cachemodes = {{ disk_cachemodes }}
58-{% endif -%}
59+{% endif %}
60
61 {% include "parts/cinder" %}
62
63
64=== modified file 'templates/liberty/nova.conf'
65--- templates/liberty/nova.conf 2016-02-12 11:10:28 +0000
66+++ templates/liberty/nova.conf 2016-02-22 20:15:22 +0000
67@@ -162,25 +162,22 @@
68 {% if cpu_model -%}
69 cpu_model = {{ cpu_model }}
70 {% endif -%}
71-{% if libvirt_images_type -%}
72+{% if libvirt_images_type and rbd_pool -%}
73 images_type = {{ libvirt_images_type }}
74 images_rbd_pool = {{ rbd_pool }}
75 images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}
76-inject_password=false
77-inject_key=false
78-inject_partition=-2
79+inject_password = false
80+inject_key = false
81+inject_partition = -2
82 {% endif -%}
83-{% if rbd_pool -%}
84-rbd_pool = {{ rbd_pool }}
85 rbd_user = {{ rbd_user }}
86 rbd_secret_uuid = {{ rbd_secret_uuid }}
87-{% endif -%}
88 {% if live_migration_uri -%}
89 live_migration_uri = {{ live_migration_uri }}
90 {% endif -%}
91 {% if disk_cachemodes -%}
92 disk_cachemodes = {{ disk_cachemodes }}
93-{% endif -%}
94+{% endif %}
95
96 {% include "parts/section-database" %}
97
98@@ -188,3 +185,6 @@
99
100 [oslo_concurrency]
101 lock_path=/var/lock/nova
102+
103+[workarounds]
104+disable_libvirt_livesnapshot = False
105
106=== modified file 'templates/mitaka/nova.conf'
107--- templates/mitaka/nova.conf 2016-02-18 12:30:21 +0000
108+++ templates/mitaka/nova.conf 2016-02-22 20:15:22 +0000
109@@ -163,25 +163,22 @@
110 {% if cpu_model -%}
111 cpu_model = {{ cpu_model }}
112 {% endif -%}
113-{% if libvirt_images_type -%}
114+{% if libvirt_images_type and rbd_pool -%}
115 images_type = {{ libvirt_images_type }}
116 images_rbd_pool = {{ rbd_pool }}
117 images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}
118-inject_password=false
119-inject_key=false
120-inject_partition=-2
121+inject_password = false
122+inject_key = false
123+inject_partition = -2
124 {% endif -%}
125-{% if rbd_pool -%}
126-rbd_pool = {{ rbd_pool }}
127 rbd_user = {{ rbd_user }}
128 rbd_secret_uuid = {{ rbd_secret_uuid }}
129-{% endif -%}
130 {% if live_migration_uri -%}
131 live_migration_uri = {{ live_migration_uri }}
132 {% endif -%}
133 {% if disk_cachemodes -%}
134 disk_cachemodes = {{ disk_cachemodes }}
135-{% endif -%}
136+{% endif %}
137
138 {% include "parts/section-database" %}
139
140@@ -191,3 +188,6 @@
141
142 [oslo_concurrency]
143 lock_path=/var/lock/nova
144+
145+[workarounds]
146+disable_libvirt_livesnapshot = False

Subscribers

People subscribed via source and target branches