Move default_ephemeral_format to [DEFAULT] section
The default_ephemeral_format line in nova.conf was not in the [DEFAULT] section in the templates and has therefore been ignored ny nova-compute. This change moves it to the correct section for all releases. Closes-Bug: #1992386 Change-Id: I0a338da505bd9f1dc4eaecfbbcb93c7ecbfa6960
This commit is contained in:
parent
c16a9aedab
commit
7a9aef2154
|
@ -141,6 +141,10 @@ instances_path = {{ instances_path }}
|
|||
default_availability_zone = {{ default_availability_zone }}
|
||||
{% endif -%}
|
||||
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
|
||||
{% if console_access_protocol == 'spice' -%}
|
||||
[spice]
|
||||
agent_enabled = True
|
||||
|
@ -176,8 +180,5 @@ disk_cachemodes = {{ disk_cachemodes }}
|
|||
{% if use_multipath -%}
|
||||
iscsi_use_multipath = {{ use_multipath }}
|
||||
{% endif %}
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
|
||||
{% include "parts/section-ephemeral" %}
|
||||
|
|
|
@ -133,6 +133,10 @@ instances_path = {{ instances_path }}
|
|||
default_availability_zone = {{ default_availability_zone }}
|
||||
{% endif -%}
|
||||
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
|
||||
{% if console_access_protocol == 'spice' -%}
|
||||
[spice]
|
||||
agent_enabled = True
|
||||
|
@ -171,9 +175,6 @@ disk_cachemodes = {{ disk_cachemodes }}
|
|||
{% if use_multipath -%}
|
||||
iscsi_use_multipath = {{ use_multipath }}
|
||||
{% endif %}
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
|
||||
{% include "parts/section-cinder" %}
|
||||
|
||||
|
|
|
@ -131,6 +131,11 @@ default_availability_zone = {{ default_availability_zone }}
|
|||
|
||||
metadata_workers = {{ workers }}
|
||||
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
|
||||
|
||||
{% if network_manager == 'neutron' and network_manager_config -%}
|
||||
[neutron]
|
||||
url = {{ network_manager_config.neutron_url }}
|
||||
|
@ -193,9 +198,6 @@ disk_cachemodes = {{ disk_cachemodes }}
|
|||
{% if use_multipath -%}
|
||||
iscsi_use_multipath = {{ use_multipath }}
|
||||
{% endif %}
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
|
||||
{% include "parts/section-database" %}
|
||||
|
||||
|
|
|
@ -145,6 +145,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
|
|||
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
||||
{% endif -%}
|
||||
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
|
||||
{% if network_manager == 'neutron' and network_manager_config -%}
|
||||
[neutron]
|
||||
url = {{ network_manager_config.neutron_url }}
|
||||
|
@ -207,9 +211,6 @@ disk_cachemodes = {{ disk_cachemodes }}
|
|||
{% if use_multipath -%}
|
||||
iscsi_use_multipath = {{ use_multipath }}
|
||||
{% endif %}
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
|
||||
{% include "parts/section-database" %}
|
||||
|
||||
|
|
|
@ -133,6 +133,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
|
|||
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
||||
{% endif -%}
|
||||
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
|
||||
[vnc]
|
||||
{% if console_vnc_type -%}
|
||||
enabled = True
|
||||
|
@ -226,9 +230,6 @@ live_migration_tunnelled = False
|
|||
{% if use_multipath -%}
|
||||
iscsi_use_multipath = {{ use_multipath }}
|
||||
{% endif %}
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
hw_disk_discard = unmap
|
||||
|
||||
{% if virt_type == 'lxd' -%}
|
||||
|
|
|
@ -138,6 +138,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
|
|||
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
||||
{% endif -%}
|
||||
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
|
||||
[vnc]
|
||||
{% if console_vnc_type -%}
|
||||
enabled = True
|
||||
|
@ -249,9 +253,6 @@ live_migration_tunnelled = False
|
|||
{% if use_multipath -%}
|
||||
volume_use_multipath = {{ use_multipath }}
|
||||
{% endif %}
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
hw_disk_discard = unmap
|
||||
|
||||
{% if virt_type == 'lxd' -%}
|
||||
|
|
|
@ -141,6 +141,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
|
|||
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
||||
{% endif -%}
|
||||
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
|
||||
[vnc]
|
||||
{% if console_vnc_type -%}
|
||||
enabled = True
|
||||
|
@ -258,9 +262,6 @@ live_migration_tunnelled = False
|
|||
{% if use_multipath -%}
|
||||
volume_use_multipath = {{ use_multipath }}
|
||||
{% endif %}
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
hw_disk_discard = unmap
|
||||
|
||||
{% if virt_type == 'lxd' -%}
|
||||
|
|
|
@ -127,6 +127,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
|
|||
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
||||
{% endif -%}
|
||||
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
|
||||
[vnc]
|
||||
{% if console_vnc_type -%}
|
||||
enabled = True
|
||||
|
@ -257,9 +261,6 @@ live_migration_tunnelled = False
|
|||
{% if use_multipath -%}
|
||||
volume_use_multipath = {{ use_multipath }}
|
||||
{% endif %}
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
hw_disk_discard = unmap
|
||||
|
||||
{% if virt_type == 'lxd' -%}
|
||||
|
|
|
@ -139,6 +139,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
|
|||
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
||||
{% endif -%}
|
||||
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
|
||||
[vnc]
|
||||
{% if console_vnc_type -%}
|
||||
enabled = True
|
||||
|
@ -284,9 +288,6 @@ live_migration_tunnelled = False
|
|||
{% if use_multipath -%}
|
||||
volume_use_multipath = {{ use_multipath }}
|
||||
{% endif %}
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
hw_disk_discard = unmap
|
||||
|
||||
{% if virt_type == 'lxd' -%}
|
||||
|
|
|
@ -139,6 +139,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
|
|||
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
||||
{% endif -%}
|
||||
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
|
||||
[vnc]
|
||||
{% if console_vnc_type -%}
|
||||
enabled = True
|
||||
|
@ -302,9 +306,6 @@ live_migration_tunnelled = False
|
|||
{% if use_multipath -%}
|
||||
volume_use_multipath = {{ use_multipath }}
|
||||
{% endif %}
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
hw_disk_discard = unmap
|
||||
{% if virtio_net_tx_queue_size -%}
|
||||
tx_queue_size = {{ virtio_net_tx_queue_size }}
|
||||
|
|
|
@ -152,6 +152,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
|
|||
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
||||
{% endif -%}
|
||||
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
|
||||
[vnc]
|
||||
{% if console_vnc_type -%}
|
||||
enabled = True
|
||||
|
@ -316,9 +320,6 @@ live_migration_tunnelled = False
|
|||
{% if use_multipath -%}
|
||||
volume_use_multipath = {{ use_multipath }}
|
||||
{% endif %}
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
hw_disk_discard = unmap
|
||||
{% if virtio_net_tx_queue_size -%}
|
||||
tx_queue_size = {{ virtio_net_tx_queue_size }}
|
||||
|
|
|
@ -180,6 +180,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
|
|||
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
||||
{% endif -%}
|
||||
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
|
||||
[pci]
|
||||
{% if pci_passthrough_whitelist -%}
|
||||
passthrough_whitelist = {{ pci_passthrough_whitelist }}
|
||||
|
@ -323,9 +327,6 @@ live_migration_tunnelled = False
|
|||
{% if use_multipath -%}
|
||||
volume_use_multipath = {{ use_multipath }}
|
||||
{% endif %}
|
||||
{% if default_ephemeral_format -%}
|
||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||
{% endif %}
|
||||
hw_disk_discard = unmap
|
||||
{% if virtio_net_tx_queue_size -%}
|
||||
tx_queue_size = {{ virtio_net_tx_queue_size }}
|
||||
|
|
Loading…
Reference in New Issue