Remove Mitaka Deprecated items
This commit removes the following Mitaka deprecated items from the nova template (and their variable definitions, if any): - the managers ```compute_manager``` and ```conductor.manager``` - ```security_group_api``` now that it's discovered with ```use_neutron``` - live/block_migration_flag config options (see also https://review.openstack.org/#/c/263436/) - ```memcached_servers``` from [DEFAULT] (moved to [cache]) Change-Id: I13c503a0ab23c72f90462cbada50424edbaa71b8
This commit is contained in:
parent
6bbb995f8b
commit
451cd166ce
@ -102,9 +102,6 @@ nova_virt_types:
|
|||||||
nova_compute_driver: nova.virt.ironic.IronicDriver
|
nova_compute_driver: nova.virt.ironic.IronicDriver
|
||||||
nova_scheduler_host_manager: ironic_host_manager
|
nova_scheduler_host_manager: ironic_host_manager
|
||||||
nova_reserved_host_memory_mb: 0
|
nova_reserved_host_memory_mb: 0
|
||||||
# NOTE(mrda): It's possible to use ironic.nova.compute.manager.ClusteredComputeManager
|
|
||||||
# here, but at the current time it's not recommended
|
|
||||||
nova_compute_manager: nova.compute.manager.ComputeManager
|
|
||||||
nova_firewall_driver: nova.virt.firewall.NoopFirewallDriver
|
nova_firewall_driver: nova.virt.firewall.NoopFirewallDriver
|
||||||
nova_scheduler_use_baremetal_filters: True
|
nova_scheduler_use_baremetal_filters: True
|
||||||
nova_scheduler_tracks_instance_changes: False
|
nova_scheduler_tracks_instance_changes: False
|
||||||
@ -112,7 +109,6 @@ nova_virt_types:
|
|||||||
nova_compute_driver: libvirt.LibvirtDriver
|
nova_compute_driver: libvirt.LibvirtDriver
|
||||||
nova_scheduler_host_manager: host_manager
|
nova_scheduler_host_manager: host_manager
|
||||||
nova_reserved_host_memory_mb: 2048
|
nova_reserved_host_memory_mb: 2048
|
||||||
nova_compute_manager: nova.compute.manager.ComputeManager
|
|
||||||
nova_firewall_driver: nova.virt.firewall.NoopFirewallDriver
|
nova_firewall_driver: nova.virt.firewall.NoopFirewallDriver
|
||||||
nova_scheduler_use_baremetal_filters: False
|
nova_scheduler_use_baremetal_filters: False
|
||||||
nova_scheduler_tracks_instance_changes: True
|
nova_scheduler_tracks_instance_changes: True
|
||||||
@ -120,7 +116,6 @@ nova_virt_types:
|
|||||||
nova_compute_driver: libvirt.LibvirtDriver
|
nova_compute_driver: libvirt.LibvirtDriver
|
||||||
nova_scheduler_host_manager: host_manager
|
nova_scheduler_host_manager: host_manager
|
||||||
nova_reserved_host_memory_mb: 2048
|
nova_reserved_host_memory_mb: 2048
|
||||||
nova_compute_manager: nova.compute.manager.ComputeManager
|
|
||||||
nova_firewall_driver: nova.virt.firewall.NoopFirewallDriver
|
nova_firewall_driver: nova.virt.firewall.NoopFirewallDriver
|
||||||
nova_scheduler_use_baremetal_filters: False
|
nova_scheduler_use_baremetal_filters: False
|
||||||
nova_scheduler_tracks_instance_changes: True
|
nova_scheduler_tracks_instance_changes: True
|
||||||
@ -128,7 +123,6 @@ nova_virt_types:
|
|||||||
nova_compute_driver: nova_powervm.virt.powervm.driver.PowerVMDriver
|
nova_compute_driver: nova_powervm.virt.powervm.driver.PowerVMDriver
|
||||||
nova_scheduler_host_manager: host_manager
|
nova_scheduler_host_manager: host_manager
|
||||||
nova_reserved_host_memory_mb: 8192
|
nova_reserved_host_memory_mb: 8192
|
||||||
nova_compute_manager: nova.compute.manager.ComputeManager
|
|
||||||
nova_firewall_driver: nova.virt.firewall.NoopFirewallDriver
|
nova_firewall_driver: nova.virt.firewall.NoopFirewallDriver
|
||||||
nova_scheduler_use_baremetal_filters: False
|
nova_scheduler_use_baremetal_filters: False
|
||||||
nova_scheduler_tracks_instance_changes: True
|
nova_scheduler_tracks_instance_changes: True
|
||||||
@ -218,7 +212,6 @@ nova_libvirt_inject_partition: -2
|
|||||||
nova_libvirt_inject_password: False
|
nova_libvirt_inject_password: False
|
||||||
nova_libvirt_disk_cachemodes: '{{ nova_libvirt_images_rbd_pool is defined | ternary("network=writeback", "") }}'
|
nova_libvirt_disk_cachemodes: '{{ nova_libvirt_images_rbd_pool is defined | ternary("network=writeback", "") }}'
|
||||||
nova_libvirt_hw_disk_discard: '{{ nova_libvirt_images_rbd_pool is defined | ternary("unmap", "ignore") }}'
|
nova_libvirt_hw_disk_discard: '{{ nova_libvirt_images_rbd_pool is defined | ternary("unmap", "ignore") }}'
|
||||||
nova_libvirt_live_migration_flag: "VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_MIGRATE_TUNNELLED"
|
|
||||||
|
|
||||||
## Nova conductor
|
## Nova conductor
|
||||||
nova_conductor_program_name: nova-conductor
|
nova_conductor_program_name: nova-conductor
|
||||||
|
10
releasenotes/notes/mitaka-deprecations-72bec69c1395261d.yaml
Normal file
10
releasenotes/notes/mitaka-deprecations-72bec69c1395261d.yaml
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
---
|
||||||
|
other:
|
||||||
|
- |
|
||||||
|
``nova_libvirt_live_migration_flag`` is now phased out.
|
||||||
|
Please create a nova configuration override with
|
||||||
|
``live_migration_tunnelled: True`` if you want to force the flag
|
||||||
|
``VIR_MIGRATE_TUNNELLED`` to libvirt. Nova "chooses a sensible
|
||||||
|
default" otherwise.
|
||||||
|
- |
|
||||||
|
``nova_compute_manager`` is now phased out.
|
@ -63,7 +63,6 @@ api_paste_config = /etc/nova/api-paste.ini
|
|||||||
allow_resize_to_same_host = True
|
allow_resize_to_same_host = True
|
||||||
image_cache_manager_interval = {{ nova_image_cache_manager_interval }}
|
image_cache_manager_interval = {{ nova_image_cache_manager_interval }}
|
||||||
resume_guests_state_on_host_boot = {{ nova_resume_guests_state_on_host_boot }}
|
resume_guests_state_on_host_boot = {{ nova_resume_guests_state_on_host_boot }}
|
||||||
compute_manager = {{ nova_compute_manager }}
|
|
||||||
|
|
||||||
{% if nova_console_user_ssl_cert is defined and nova_console_user_ssl_key is defined and inventory_hostname in groups['nova_console'] %}
|
{% if nova_console_user_ssl_cert is defined and nova_console_user_ssl_key is defined and inventory_hostname in groups['nova_console'] %}
|
||||||
# Console SSL keys
|
# Console SSL keys
|
||||||
@ -95,7 +94,6 @@ firewall_driver = {{ nova_firewall_driver }}
|
|||||||
use_forwarded_for = {{ nova_network_services[nova_network_type]['use_forwarded_for'] | bool }}
|
use_forwarded_for = {{ nova_network_services[nova_network_type]['use_forwarded_for'] | bool }}
|
||||||
my_ip = {{ nova_management_address }}
|
my_ip = {{ nova_management_address }}
|
||||||
default_floating_pool = public
|
default_floating_pool = public
|
||||||
security_group_api = neutron
|
|
||||||
use_neutron = True
|
use_neutron = True
|
||||||
|
|
||||||
# Authentication
|
# Authentication
|
||||||
@ -118,9 +116,6 @@ force_config_drive = {{ nova_force_config_drive }}
|
|||||||
# Policy
|
# Policy
|
||||||
max_age = {{ nova_max_age }}
|
max_age = {{ nova_max_age }}
|
||||||
|
|
||||||
# Common
|
|
||||||
memcached_servers = {{ memcached_servers }}
|
|
||||||
|
|
||||||
# Ceilometer notification configurations
|
# Ceilometer notification configurations
|
||||||
{% if nova_ceilometer_enabled %}
|
{% if nova_ceilometer_enabled %}
|
||||||
instance_usage_audit = True
|
instance_usage_audit = True
|
||||||
@ -133,6 +128,12 @@ notify_on_state_change = vm_and_task_state
|
|||||||
driver = messagingv2
|
driver = messagingv2
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
# Cache
|
||||||
|
[cache]
|
||||||
|
enabled = true
|
||||||
|
memcache_servers = {{ memcached_servers }}
|
||||||
|
|
||||||
|
|
||||||
# Cinder
|
# Cinder
|
||||||
[cinder]
|
[cinder]
|
||||||
catalog_info = volumev2:cinderv2:internalURL
|
catalog_info = volumev2:cinderv2:internalURL
|
||||||
@ -189,7 +190,6 @@ ovs_bridge = {{ nova_network_services[nova_network_type]['ovs_bridge'] }}
|
|||||||
|
|
||||||
[conductor]
|
[conductor]
|
||||||
topic = conductor
|
topic = conductor
|
||||||
manager = nova.conductor.manager.ConductorManager
|
|
||||||
workers = {{ nova_conductor_workers | default(api_threads) }}
|
workers = {{ nova_conductor_workers | default(api_threads) }}
|
||||||
|
|
||||||
|
|
||||||
@ -277,7 +277,6 @@ images_type = rbd
|
|||||||
images_rbd_pool = {{ nova_libvirt_images_rbd_pool }}
|
images_rbd_pool = {{ nova_libvirt_images_rbd_pool }}
|
||||||
images_rbd_ceph_conf = /etc/ceph/ceph.conf
|
images_rbd_ceph_conf = /etc/ceph/ceph.conf
|
||||||
{% endif %}
|
{% endif %}
|
||||||
live_migration_flag = "{{ nova_libvirt_live_migration_flag }}"
|
|
||||||
live_migration_uri = "qemu+ssh://nova@%s/system?no_verify=1&keyfile={{ nova_system_home_folder }}/.ssh/id_rsa"
|
live_migration_uri = "qemu+ssh://nova@%s/system?no_verify=1&keyfile={{ nova_system_home_folder }}/.ssh/id_rsa"
|
||||||
hw_disk_discard = {{ nova_libvirt_hw_disk_discard }}
|
hw_disk_discard = {{ nova_libvirt_hw_disk_discard }}
|
||||||
disk_cachemodes = {{ nova_libvirt_disk_cachemodes }}
|
disk_cachemodes = {{ nova_libvirt_disk_cachemodes }}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user