openstack/openstack-ansible-os_nova
Code Issues Proposed changes

Adjust conf for deprecation warnings

Browse Source 
Remove deprecated config options and move those that are now in
different configuration sections.

Change-Id: Ifea82dc03a859356eb55b097aa5747e3fa0c40ba
This commit is contained in:
Andy McCrae 2017-02-24 12:09:34 -05:00 committed by Andy McCrae
parent 410cbed571
commit 7c9a64b2ed
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
defaults/main.yml
View File

@ -316,7 +316,6 @@ nova_max_age: 0
nova_remove_unused_resized_minimum_age_seconds: 3600
nova_image_cache_manager_interval: 0
nova_resume_guests_state_on_host_boot: False
nova_dhcp_domain: novalocal
nova_default_schedule_zone: nova
# Comma separated list of Glance API servers
@ -338,8 +337,6 @@ nova_network_services:
# Nova quota
nova_quota_cores: 20
nova_quota_fixed_ips: -1
nova_quota_floating_ips: 10
nova_quota_injected_file_content_bytes: 10240
nova_quota_injected_file_path_length: 255
nova_quota_injected_files: 5
@ -347,8 +344,6 @@ nova_quota_instances: 10
nova_quota_key_pairs: 100
nova_quota_metadata_items: 128
nova_quota_ram: 51200
nova_quota_security_group_rules: 20
nova_quota_security_groups: 10
nova_quota_server_group_members: 10
nova_quota_server_groups: 10

13
releasenotes/notes/nova-ocata-conf-deprecations-0a99d13c97424c51.yaml Normal file
View File

@ -0,0 +1,13 @@
---
deprecations:
- Several ``nova.conf`` options that were deprecated have
been removed from the ``os_nova`` role. The
following OpenStack-Ansible variables are no longer
used and should be removed from any variable override
files.
* ``nova_dhcp_domain``
* ``nova_quota_fixed_ips``
* ``nova_quota_floating_ips``
* ``nova_quota_security_group_rules``
* ``nova_quota_security_groups``

12
templates/nova.conf.j2
View File

@ -50,14 +50,11 @@ metadata_port = {{ nova_metadata_port }}
metadata_workers = {{ nova_metadata_workers | default(nova_api_threads) }}
# Network
dhcp_domain = {{ nova_dhcp_domain }}
force_dhcp_release = True
dhcpbridge_flagfile = /etc/nova/nova.conf
firewall_driver = {{ nova_firewall_driver }}
my_ip = {% if nova_management_address == 'localhost' %}127.0.0.1{% else %}{{ nova_management_address }}{% endif %}
default_floating_pool = public
use_neutron = True
## Vif
linuxnet_interface_driver = {{ nova_linuxnet_interface_driver }}
@ -82,9 +79,6 @@ injected_network_template = /etc/nova/nova-interfaces-template
# Configdrive
force_config_drive = {{ nova_force_config_drive }}
# Policy
max_age = {{ nova_max_age }}
# Ceilometer notification configurations
{% if nova_ceilometer_enabled %}
instance_usage_audit = True
@ -276,7 +270,6 @@ images_type = rbd
images_rbd_pool = {{ nova_libvirt_images_rbd_pool }}
images_rbd_ceph_conf = /etc/ceph/ceph.conf
{% endif %}
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 }}
disk_cachemodes = {{ nova_libvirt_disk_cachemodes }}
{% endif %}
@ -320,16 +313,13 @@ tracks_instance_changes = {{ nova_scheduler_tracks_instance_changes }}
[quota]
cores = {{ nova_quota_cores }}
fixed_ips = {{ nova_quota_fixed_ips }}
floating_ips = {{ nova_quota_floating_ips }}
injected_file_content_bytes = {{ nova_quota_injected_file_content_bytes }}
injected_file_path_length = {{ nova_quota_injected_file_path_length }}
injected_files = {{ nova_quota_injected_files }}
instances = {{ nova_quota_instances }}
key_pairs = {{ nova_quota_key_pairs }}
max_age = {{ nova_max_age }}
metadata_items = {{ nova_quota_metadata_items }}
ram = {{ nova_quota_ram }}
security_group_rules = {{ nova_quota_security_group_rules }}
security_groups = {{ nova_quota_security_groups }}
server_group_members = {{ nova_quota_server_group_members }}
server_groups = {{ nova_quota_server_groups }}