openstack/charm-nova-compute
Code Issues Proposed changes

[hopem,r=1chb1n]

Browse Source 
Apply conf template changes from bug 1489463 and bug 1543586
to all templates.
Closes-Bug: 1548478
This commit is contained in:
Ryan Beisner 2016-02-22 23:14:06 +00:00
commit 647efcc515
4 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates/icehouse/nova.conf
View File

@ -155,7 +155,7 @@ cpu_mode = {{ cpu_mode }}
{% if cpu_model -%} {% if cpu_model -%}
cpu_model = {{ cpu_model }} cpu_model = {{ cpu_model }}
{% endif -%} {% endif -%}
{% if libvirt_images_type -%} {% if libvirt_images_type and rbd_pool -%}
images_type = {{ libvirt_images_type }} images_type = {{ libvirt_images_type }}
images_rbd_pool = {{ rbd_pool }} images_rbd_pool = {{ rbd_pool }}
images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }} images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}
@ -163,11 +163,8 @@ inject_password=false
inject_key = false inject_key = false
inject_partition = -2 inject_partition = -2
{% endif -%} {% endif -%}
{% if rbd_pool -%}
rbd_pool = {{ rbd_pool }}
rbd_user = {{ rbd_user }} rbd_user = {{ rbd_user }}
rbd_secret_uuid = {{ rbd_secret_uuid }} rbd_secret_uuid = {{ rbd_secret_uuid }}
{% endif -%}
{% if disk_cachemodes -%} {% if disk_cachemodes -%}
disk_cachemodes = {{ disk_cachemodes }} disk_cachemodes = {{ disk_cachemodes }}
{% endif -%} {% endif -%}

7
templates/juno/nova.conf
View File

@ -148,7 +148,7 @@ cpu_mode = {{ cpu_mode }}
{% if cpu_model -%} {% if cpu_model -%}
cpu_model = {{ cpu_model }} cpu_model = {{ cpu_model }}
{% endif -%} {% endif -%}
{% if libvirt_images_type -%} {% if libvirt_images_type and rbd_pool -%}
images_type = {{ libvirt_images_type }} images_type = {{ libvirt_images_type }}
images_rbd_pool = {{ rbd_pool }} images_rbd_pool = {{ rbd_pool }}
images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }} images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}
@ -156,17 +156,14 @@ inject_password=false
inject_key = false inject_key = false
inject_partition = -2 inject_partition = -2
{% endif -%} {% endif -%}
{% if rbd_pool -%}
rbd_pool = {{ rbd_pool }}
rbd_user = {{ rbd_user }} rbd_user = {{ rbd_user }}
rbd_secret_uuid = {{ rbd_secret_uuid }} rbd_secret_uuid = {{ rbd_secret_uuid }}
{% endif -%}
{% if live_migration_uri -%} {% if live_migration_uri -%}
live_migration_uri = {{ live_migration_uri }} live_migration_uri = {{ live_migration_uri }}
{% endif -%} {% endif -%}
{% if disk_cachemodes -%} {% if disk_cachemodes -%}
disk_cachemodes = {{ disk_cachemodes }} disk_cachemodes = {{ disk_cachemodes }}
{% endif -%} {% endif %}
{% include "parts/cinder" %} {% include "parts/cinder" %}

10
templates/liberty/nova.conf
View File

@ -162,7 +162,7 @@ cpu_mode = {{ cpu_mode }}
{% if cpu_model -%} {% if cpu_model -%}
cpu_model = {{ cpu_model }} cpu_model = {{ cpu_model }}
{% endif -%} {% endif -%}
{% if libvirt_images_type -%} {% if libvirt_images_type and rbd_pool -%}
images_type = {{ libvirt_images_type }} images_type = {{ libvirt_images_type }}
images_rbd_pool = {{ rbd_pool }} images_rbd_pool = {{ rbd_pool }}
images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }} images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}
@ -170,17 +170,14 @@ inject_password=false
inject_key = false inject_key = false
inject_partition = -2 inject_partition = -2
{% endif -%} {% endif -%}
{% if rbd_pool -%}
rbd_pool = {{ rbd_pool }}
rbd_user = {{ rbd_user }} rbd_user = {{ rbd_user }}
rbd_secret_uuid = {{ rbd_secret_uuid }} rbd_secret_uuid = {{ rbd_secret_uuid }}
{% endif -%}
{% if live_migration_uri -%} {% if live_migration_uri -%}
live_migration_uri = {{ live_migration_uri }} live_migration_uri = {{ live_migration_uri }}
{% endif -%} {% endif -%}
{% if disk_cachemodes -%} {% if disk_cachemodes -%}
disk_cachemodes = {{ disk_cachemodes }} disk_cachemodes = {{ disk_cachemodes }}
{% endif -%} {% endif %}
{% include "parts/section-database" %} {% include "parts/section-database" %}
@ -188,3 +185,6 @@ disk_cachemodes = {{ disk_cachemodes }}
[oslo_concurrency] [oslo_concurrency]
lock_path=/var/lock/nova lock_path=/var/lock/nova
[workarounds]
disable_libvirt_livesnapshot = False

10
templates/mitaka/nova.conf
View File

@ -163,7 +163,7 @@ cpu_mode = {{ cpu_mode }}
{% if cpu_model -%} {% if cpu_model -%}
cpu_model = {{ cpu_model }} cpu_model = {{ cpu_model }}
{% endif -%} {% endif -%}
{% if libvirt_images_type -%} {% if libvirt_images_type and rbd_pool -%}
images_type = {{ libvirt_images_type }} images_type = {{ libvirt_images_type }}
images_rbd_pool = {{ rbd_pool }} images_rbd_pool = {{ rbd_pool }}
images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }} images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}
@ -171,17 +171,14 @@ inject_password=false
inject_key = false inject_key = false
inject_partition = -2 inject_partition = -2
{% endif -%} {% endif -%}
{% if rbd_pool -%}
rbd_pool = {{ rbd_pool }}
rbd_user = {{ rbd_user }} rbd_user = {{ rbd_user }}
rbd_secret_uuid = {{ rbd_secret_uuid }} rbd_secret_uuid = {{ rbd_secret_uuid }}
{% endif -%}
{% if live_migration_uri -%} {% if live_migration_uri -%}
live_migration_uri = {{ live_migration_uri }} live_migration_uri = {{ live_migration_uri }}
{% endif -%} {% endif -%}
{% if disk_cachemodes -%} {% if disk_cachemodes -%}
disk_cachemodes = {{ disk_cachemodes }} disk_cachemodes = {{ disk_cachemodes }}
{% endif -%} {% endif %}
{% include "parts/section-database" %} {% include "parts/section-database" %}
@ -191,3 +188,6 @@ disk_cachemodes = {{ disk_cachemodes }}
[oslo_concurrency] [oslo_concurrency]
lock_path=/var/lock/nova lock_path=/var/lock/nova
[workarounds]
disable_libvirt_livesnapshot = False