openstack/charm-nova-compute
Code Issues Proposed changes

Add live_migration_scheme to Train configuration template

Browse Source 
Use live_migration_scheme instead of deprecated live_migration_uri
which is not set by charm code on versions greater than Ocata.
Furthermore, remove the check from every template >= Ocata because
live_migration_uri is never set by nova_compute_context.py (L205)

Change-Id: Id19a0e72dad28fbd729002ec1dfb7cf4acfcf2bc
Closes-Bug: #1862659
Signed-off-by: Stamatis Katsaounis <skatsaounis@admin.grnet.gr>
This commit is contained in:
Stamatis Katsaounis 2020-02-10 18:22:02 +02:00
parent 3b4aca0753
commit 0120c59499
5 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
templates/ocata/nova.conf
View File

@ -212,9 +212,6 @@ inject_partition = -2
{% endif -%} {% endif -%}
rbd_user = {{ rbd_user }} rbd_user = {{ rbd_user }}
rbd_secret_uuid = {{ rbd_secret_uuid }} rbd_secret_uuid = {{ rbd_secret_uuid }}
{% if live_migration_uri -%}
live_migration_uri = {{ live_migration_uri }}
{% endif -%}
{% if live_migration_scheme -%} {% if live_migration_scheme -%}
live_migration_scheme = {{ live_migration_scheme }} live_migration_scheme = {{ live_migration_scheme }}
{% endif -%} {% endif -%}

3
templates/pike/nova.conf
View File

@ -213,9 +213,6 @@ inject_partition = -2
{% endif -%} {% endif -%}
rbd_user = {{ rbd_user }} rbd_user = {{ rbd_user }}
rbd_secret_uuid = {{ rbd_secret_uuid }} rbd_secret_uuid = {{ rbd_secret_uuid }}
{% if live_migration_uri -%}
live_migration_uri = {{ live_migration_uri }}
{% endif -%}
{% if live_migration_scheme -%} {% if live_migration_scheme -%}
live_migration_scheme = {{ live_migration_scheme }} live_migration_scheme = {{ live_migration_scheme }}
{% endif -%} {% endif -%}

3
templates/queens/nova.conf
View File

@ -231,9 +231,6 @@ inject_partition = -2
{% endif -%} {% endif -%}
rbd_user = {{ rbd_user }} rbd_user = {{ rbd_user }}
rbd_secret_uuid = {{ rbd_secret_uuid }} rbd_secret_uuid = {{ rbd_secret_uuid }}
{% if live_migration_uri -%}
live_migration_uri = {{ live_migration_uri }}
{% endif -%}
{% if live_migration_scheme -%} {% if live_migration_scheme -%}
live_migration_scheme = {{ live_migration_scheme }} live_migration_scheme = {{ live_migration_scheme }}
{% endif -%} {% endif -%}

3
templates/rocky/nova.conf
View File

@ -231,9 +231,6 @@ inject_partition = -2
{% endif -%} {% endif -%}
rbd_user = {{ rbd_user }} rbd_user = {{ rbd_user }}
rbd_secret_uuid = {{ rbd_secret_uuid }} rbd_secret_uuid = {{ rbd_secret_uuid }}
{% if live_migration_uri -%}
live_migration_uri = {{ live_migration_uri }}
{% endif -%}
{% if live_migration_scheme -%} {% if live_migration_scheme -%}
live_migration_scheme = {{ live_migration_scheme }} live_migration_scheme = {{ live_migration_scheme }}
{% endif -%} {% endif -%}

7
templates/train/nova.conf
View File

@ -242,8 +242,11 @@ inject_partition = -2
{% endif -%} {% endif -%}
rbd_user = {{ rbd_user }} rbd_user = {{ rbd_user }}
rbd_secret_uuid = {{ rbd_secret_uuid }} rbd_secret_uuid = {{ rbd_secret_uuid }}
{% if live_migration_uri -%} {% if live_migration_scheme -%}
live_migration_uri = {{ live_migration_uri }} live_migration_scheme = {{ live_migration_scheme }}
{% endif -%}
{% if live_migration_inbound_addr -%}
live_migration_inbound_addr = {{ live_migration_inbound_addr }}
{% endif -%} {% endif -%}
{% if live_migration_permit_post_copy -%} {% if live_migration_permit_post_copy -%}
live_migration_permit_post_copy = {{ live_migration_permit_post_copy }} live_migration_permit_post_copy = {{ live_migration_permit_post_copy }}