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: I713872f49ff4c40c78909f1879cca09f331d5c13
This commit is contained in:
parent
9092d68ae6
commit
93b9faff40
@ -141,6 +141,10 @@ instances_path = {{ instances_path }}
|
|||||||
default_availability_zone = {{ default_availability_zone }}
|
default_availability_zone = {{ default_availability_zone }}
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
|
||||||
|
{% if default_ephemeral_format -%}
|
||||||
|
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
{% if console_access_protocol == 'spice' -%}
|
{% if console_access_protocol == 'spice' -%}
|
||||||
[spice]
|
[spice]
|
||||||
agent_enabled = True
|
agent_enabled = True
|
||||||
@ -176,8 +180,5 @@ disk_cachemodes = {{ disk_cachemodes }}
|
|||||||
{% if use_multipath -%}
|
{% if use_multipath -%}
|
||||||
iscsi_use_multipath = {{ use_multipath }}
|
iscsi_use_multipath = {{ use_multipath }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if default_ephemeral_format -%}
|
|
||||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% include "parts/section-ephemeral" %}
|
{% include "parts/section-ephemeral" %}
|
||||||
|
@ -133,6 +133,10 @@ instances_path = {{ instances_path }}
|
|||||||
default_availability_zone = {{ default_availability_zone }}
|
default_availability_zone = {{ default_availability_zone }}
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
|
||||||
|
{% if default_ephemeral_format -%}
|
||||||
|
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
{% if console_access_protocol == 'spice' -%}
|
{% if console_access_protocol == 'spice' -%}
|
||||||
[spice]
|
[spice]
|
||||||
agent_enabled = True
|
agent_enabled = True
|
||||||
@ -171,9 +175,6 @@ disk_cachemodes = {{ disk_cachemodes }}
|
|||||||
{% if use_multipath -%}
|
{% if use_multipath -%}
|
||||||
iscsi_use_multipath = {{ use_multipath }}
|
iscsi_use_multipath = {{ use_multipath }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if default_ephemeral_format -%}
|
|
||||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% include "parts/section-cinder" %}
|
{% include "parts/section-cinder" %}
|
||||||
|
|
||||||
|
@ -131,6 +131,11 @@ default_availability_zone = {{ default_availability_zone }}
|
|||||||
|
|
||||||
metadata_workers = {{ workers }}
|
metadata_workers = {{ workers }}
|
||||||
|
|
||||||
|
{% if default_ephemeral_format -%}
|
||||||
|
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
|
||||||
{% if network_manager == 'neutron' and network_manager_config -%}
|
{% if network_manager == 'neutron' and network_manager_config -%}
|
||||||
[neutron]
|
[neutron]
|
||||||
url = {{ network_manager_config.neutron_url }}
|
url = {{ network_manager_config.neutron_url }}
|
||||||
@ -193,9 +198,6 @@ disk_cachemodes = {{ disk_cachemodes }}
|
|||||||
{% if use_multipath -%}
|
{% if use_multipath -%}
|
||||||
iscsi_use_multipath = {{ use_multipath }}
|
iscsi_use_multipath = {{ use_multipath }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if default_ephemeral_format -%}
|
|
||||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% include "parts/section-database" %}
|
{% include "parts/section-database" %}
|
||||||
|
|
||||||
|
@ -145,6 +145,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
|
|||||||
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
|
||||||
|
{% if default_ephemeral_format -%}
|
||||||
|
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
{% if network_manager == 'neutron' and network_manager_config -%}
|
{% if network_manager == 'neutron' and network_manager_config -%}
|
||||||
[neutron]
|
[neutron]
|
||||||
url = {{ network_manager_config.neutron_url }}
|
url = {{ network_manager_config.neutron_url }}
|
||||||
@ -207,9 +211,6 @@ disk_cachemodes = {{ disk_cachemodes }}
|
|||||||
{% if use_multipath -%}
|
{% if use_multipath -%}
|
||||||
iscsi_use_multipath = {{ use_multipath }}
|
iscsi_use_multipath = {{ use_multipath }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if default_ephemeral_format -%}
|
|
||||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% include "parts/section-database" %}
|
{% include "parts/section-database" %}
|
||||||
|
|
||||||
|
@ -133,6 +133,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
|
|||||||
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
|
||||||
|
{% if default_ephemeral_format -%}
|
||||||
|
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
[vnc]
|
[vnc]
|
||||||
{% if console_vnc_type -%}
|
{% if console_vnc_type -%}
|
||||||
enabled = True
|
enabled = True
|
||||||
@ -226,9 +230,6 @@ live_migration_tunnelled = False
|
|||||||
{% if use_multipath -%}
|
{% if use_multipath -%}
|
||||||
iscsi_use_multipath = {{ use_multipath }}
|
iscsi_use_multipath = {{ use_multipath }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if default_ephemeral_format -%}
|
|
||||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
|
||||||
{% endif %}
|
|
||||||
hw_disk_discard = unmap
|
hw_disk_discard = unmap
|
||||||
|
|
||||||
{% if virt_type == 'lxd' -%}
|
{% if virt_type == 'lxd' -%}
|
||||||
|
@ -138,6 +138,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
|
|||||||
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
|
||||||
|
{% if default_ephemeral_format -%}
|
||||||
|
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
[vnc]
|
[vnc]
|
||||||
{% if console_vnc_type -%}
|
{% if console_vnc_type -%}
|
||||||
enabled = True
|
enabled = True
|
||||||
@ -249,9 +253,6 @@ live_migration_tunnelled = False
|
|||||||
{% if use_multipath -%}
|
{% if use_multipath -%}
|
||||||
volume_use_multipath = {{ use_multipath }}
|
volume_use_multipath = {{ use_multipath }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if default_ephemeral_format -%}
|
|
||||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
|
||||||
{% endif %}
|
|
||||||
hw_disk_discard = unmap
|
hw_disk_discard = unmap
|
||||||
|
|
||||||
{% if virt_type == 'lxd' -%}
|
{% if virt_type == 'lxd' -%}
|
||||||
|
@ -141,6 +141,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
|
|||||||
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
|
||||||
|
{% if default_ephemeral_format -%}
|
||||||
|
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
[vnc]
|
[vnc]
|
||||||
{% if console_vnc_type -%}
|
{% if console_vnc_type -%}
|
||||||
enabled = True
|
enabled = True
|
||||||
@ -258,9 +262,6 @@ live_migration_tunnelled = False
|
|||||||
{% if use_multipath -%}
|
{% if use_multipath -%}
|
||||||
volume_use_multipath = {{ use_multipath }}
|
volume_use_multipath = {{ use_multipath }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if default_ephemeral_format -%}
|
|
||||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
|
||||||
{% endif %}
|
|
||||||
hw_disk_discard = unmap
|
hw_disk_discard = unmap
|
||||||
|
|
||||||
{% if virt_type == 'lxd' -%}
|
{% if virt_type == 'lxd' -%}
|
||||||
|
@ -127,6 +127,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
|
|||||||
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
|
||||||
|
{% if default_ephemeral_format -%}
|
||||||
|
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
[vnc]
|
[vnc]
|
||||||
{% if console_vnc_type -%}
|
{% if console_vnc_type -%}
|
||||||
enabled = True
|
enabled = True
|
||||||
@ -257,9 +261,6 @@ live_migration_tunnelled = False
|
|||||||
{% if use_multipath -%}
|
{% if use_multipath -%}
|
||||||
volume_use_multipath = {{ use_multipath }}
|
volume_use_multipath = {{ use_multipath }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if default_ephemeral_format -%}
|
|
||||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
|
||||||
{% endif %}
|
|
||||||
hw_disk_discard = unmap
|
hw_disk_discard = unmap
|
||||||
|
|
||||||
{% if virt_type == 'lxd' -%}
|
{% if virt_type == 'lxd' -%}
|
||||||
|
@ -139,6 +139,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
|
|||||||
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
|
||||||
|
{% if default_ephemeral_format -%}
|
||||||
|
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
[vnc]
|
[vnc]
|
||||||
{% if console_vnc_type -%}
|
{% if console_vnc_type -%}
|
||||||
enabled = True
|
enabled = True
|
||||||
@ -284,9 +288,6 @@ live_migration_tunnelled = False
|
|||||||
{% if use_multipath -%}
|
{% if use_multipath -%}
|
||||||
volume_use_multipath = {{ use_multipath }}
|
volume_use_multipath = {{ use_multipath }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if default_ephemeral_format -%}
|
|
||||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
|
||||||
{% endif %}
|
|
||||||
hw_disk_discard = unmap
|
hw_disk_discard = unmap
|
||||||
|
|
||||||
{% if virt_type == 'lxd' -%}
|
{% if virt_type == 'lxd' -%}
|
||||||
|
@ -139,6 +139,10 @@ ram_allocation_ratio = {{ ram_allocation_ratio }}
|
|||||||
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
|
||||||
|
{% if default_ephemeral_format -%}
|
||||||
|
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
[vnc]
|
[vnc]
|
||||||
{% if console_vnc_type -%}
|
{% if console_vnc_type -%}
|
||||||
enabled = True
|
enabled = True
|
||||||
@ -302,9 +306,6 @@ live_migration_tunnelled = False
|
|||||||
{% if use_multipath -%}
|
{% if use_multipath -%}
|
||||||
volume_use_multipath = {{ use_multipath }}
|
volume_use_multipath = {{ use_multipath }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if default_ephemeral_format -%}
|
|
||||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
|
||||||
{% endif %}
|
|
||||||
hw_disk_discard = unmap
|
hw_disk_discard = unmap
|
||||||
{% if virtio_net_tx_queue_size -%}
|
{% if virtio_net_tx_queue_size -%}
|
||||||
tx_queue_size = {{ 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 }}
|
disk_allocation_ratio = {{ disk_allocation_ratio }}
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
|
||||||
|
{% if default_ephemeral_format -%}
|
||||||
|
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
[vnc]
|
[vnc]
|
||||||
{% if console_vnc_type -%}
|
{% if console_vnc_type -%}
|
||||||
enabled = True
|
enabled = True
|
||||||
@ -316,9 +320,6 @@ live_migration_tunnelled = False
|
|||||||
{% if use_multipath -%}
|
{% if use_multipath -%}
|
||||||
volume_use_multipath = {{ use_multipath }}
|
volume_use_multipath = {{ use_multipath }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if default_ephemeral_format -%}
|
|
||||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
|
||||||
{% endif %}
|
|
||||||
hw_disk_discard = unmap
|
hw_disk_discard = unmap
|
||||||
{% if virtio_net_tx_queue_size -%}
|
{% if virtio_net_tx_queue_size -%}
|
||||||
tx_queue_size = {{ virtio_net_tx_queue_size }}
|
tx_queue_size = {{ virtio_net_tx_queue_size }}
|
||||||
|
@ -184,6 +184,10 @@ disk_allocation_ratio = {{ disk_allocation_ratio }}
|
|||||||
allow_resize_to_same_host = {{ allow_resize_to_same_host }}
|
allow_resize_to_same_host = {{ allow_resize_to_same_host }}
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
|
||||||
|
{% if default_ephemeral_format -%}
|
||||||
|
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
[pci]
|
[pci]
|
||||||
{% if pci_passthrough_whitelist -%}
|
{% if pci_passthrough_whitelist -%}
|
||||||
passthrough_whitelist = {{ pci_passthrough_whitelist }}
|
passthrough_whitelist = {{ pci_passthrough_whitelist }}
|
||||||
@ -327,9 +331,6 @@ live_migration_tunnelled = False
|
|||||||
{% if use_multipath -%}
|
{% if use_multipath -%}
|
||||||
volume_use_multipath = {{ use_multipath }}
|
volume_use_multipath = {{ use_multipath }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if default_ephemeral_format -%}
|
|
||||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
|
||||||
{% endif %}
|
|
||||||
hw_disk_discard = unmap
|
hw_disk_discard = unmap
|
||||||
{% if virtio_net_tx_queue_size -%}
|
{% if virtio_net_tx_queue_size -%}
|
||||||
tx_queue_size = {{ virtio_net_tx_queue_size }}
|
tx_queue_size = {{ virtio_net_tx_queue_size }}
|
||||||
|
@ -165,6 +165,10 @@ disk_allocation_ratio = {{ disk_allocation_ratio }}
|
|||||||
allow_resize_to_same_host = {{ allow_resize_to_same_host }}
|
allow_resize_to_same_host = {{ allow_resize_to_same_host }}
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
|
||||||
|
{% if default_ephemeral_format -%}
|
||||||
|
default_ephemeral_format = {{ default_ephemeral_format }}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
[pci]
|
[pci]
|
||||||
{% if pci_passthrough_whitelist -%}
|
{% if pci_passthrough_whitelist -%}
|
||||||
passthrough_whitelist = {{ pci_passthrough_whitelist }}
|
passthrough_whitelist = {{ pci_passthrough_whitelist }}
|
||||||
@ -308,9 +312,6 @@ live_migration_tunnelled = False
|
|||||||
{% if use_multipath -%}
|
{% if use_multipath -%}
|
||||||
volume_use_multipath = {{ use_multipath }}
|
volume_use_multipath = {{ use_multipath }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if default_ephemeral_format -%}
|
|
||||||
default_ephemeral_format = {{ default_ephemeral_format }}
|
|
||||||
{% endif %}
|
|
||||||
hw_disk_discard = unmap
|
hw_disk_discard = unmap
|
||||||
{% if virtio_net_tx_queue_size -%}
|
{% if virtio_net_tx_queue_size -%}
|
||||||
tx_queue_size = {{ virtio_net_tx_queue_size }}
|
tx_queue_size = {{ virtio_net_tx_queue_size }}
|
||||||
|
Loading…
Reference in New Issue
Block a user