Merge "Replace/remove multiple deprecated options in group DEFAULT"

templates/mitaka/nova.conf

@@ -11,7 +11,7 @@ verbose={{ verbose }}
 debug={{ debug }}
 dhcpbridge_flagfile=/etc/nova/nova.conf
 dhcpbridge=/usr/bin/nova-dhcpbridge
-logdir=/var/log/nova
+log_dir=/var/log/nova
 state_path=/var/lib/nova
 force_dhcp_release=True
 use_syslog = {{ use_syslog }}
@@ -26,25 +26,6 @@ libvirt_use_virtio_for_bridges=False
 libvirt_disk_prefix=vd
 {% endif -%}
 
-{% if console_vnc_type -%}
-vnc_enabled = True
-novnc_enabled = True
-vnc_keymap = {{ console_keymap }}
-vncserver_listen = {{ console_listen_addr }}
-vncserver_proxyclient_address = {{ console_listen_addr }}
-{% if console_access_protocol == 'novnc' or console_access_protocol == 'vnc' -%}
-novncproxy_base_url = {{ novnc_proxy_address }}
-{% endif -%}
-{% if console_access_protocol == 'xvpvnc' or console_access_protocol == 'vnc' -%}
-xvpvncproxy_port = {{ xvpvnc_proxy_port }}
-xvpvncproxy_host = {{ xvpvnc_proxy_host }}
-xvpvncproxy_base_url = {{ xvpvnc_proxy_address }}
-{% endif -%}
-{% else -%}
-vnc_enabled = False
-novnc_enabled = False
-{% endif -%}
-
 {% if neutron_plugin and neutron_plugin in ('ovs', 'midonet') -%}
 libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtGenericVIFDriver
 {% if neutron_security_groups -%}
@@ -136,6 +117,24 @@ resume_guests_state_on_host_boot = {{ resume_guests_state_on_host_boot }}
 
 metadata_workers = {{ workers }}
 
+[vnc]
+{% if console_vnc_type -%}
+enabled = True
+keymap = {{ console_keymap }}
+vncserver_listen = {{ console_listen_addr }}
+vncserver_proxyclient_address = {{ console_listen_addr }}
+{% if console_access_protocol == 'novnc' or console_access_protocol == 'vnc' -%}
+novncproxy_base_url = {{ novnc_proxy_address }}
+{% endif -%}
+{% if console_access_protocol == 'xvpvnc' or console_access_protocol == 'vnc' -%}
+xvpvncproxy_port = {{ xvpvnc_proxy_port }}
+xvpvncproxy_host = {{ xvpvnc_proxy_host }}
+xvpvncproxy_base_url = {{ xvpvnc_proxy_address }}
+{% endif -%}
+{% else -%}
+enabled = False
+{% endif -%}
+
 {% if network_manager == 'neutron' and network_manager_config -%}
 [neutron]
 url = {{ network_manager_config.neutron_url }}

templates/newton/nova.conf

@@ -11,7 +11,7 @@ verbose={{ verbose }}
 debug={{ debug }}
 dhcpbridge_flagfile=/etc/nova/nova.conf
 dhcpbridge=/usr/bin/nova-dhcpbridge
-logdir=/var/log/nova
+log_dir=/var/log/nova
 state_path=/var/lib/nova
 force_dhcp_release=True
 use_syslog = {{ use_syslog }}
@@ -25,25 +25,6 @@ libvirt_use_virtio_for_bridges=False
 libvirt_disk_prefix=vd
 {% endif -%}
 
-{% if console_vnc_type -%}
-vnc_enabled = True
-novnc_enabled = True
-vnc_keymap = {{ console_keymap }}
-vncserver_listen = {{ console_listen_addr }}
-vncserver_proxyclient_address = {{ console_listen_addr }}
-{% if console_access_protocol == 'novnc' or console_access_protocol == 'vnc' -%}
-novncproxy_base_url = {{ novnc_proxy_address }}
-{% endif -%}
-{% if console_access_protocol == 'xvpvnc' or console_access_protocol == 'vnc' -%}
-xvpvncproxy_port = {{ xvpvnc_proxy_port }}
-xvpvncproxy_host = {{ xvpvnc_proxy_host }}
-xvpvncproxy_base_url = {{ xvpvnc_proxy_address }}
-{% endif -%}
-{% else -%}
-vnc_enabled = False
-novnc_enabled = False
-{% endif -%}
-
 {% if neutron_plugin and neutron_plugin in ('ovs', 'midonet') -%}
 libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtGenericVIFDriver
 {% if neutron_security_groups -%}
@@ -141,6 +122,24 @@ resume_guests_state_on_host_boot = {{ resume_guests_state_on_host_boot }}
 
 metadata_workers = {{ workers }}
 
+[vnc]
+{% if console_vnc_type -%}
+enabled = True
+keymap = {{ console_keymap }}
+vncserver_listen = {{ console_listen_addr }}
+vncserver_proxyclient_address = {{ console_listen_addr }}
+{% if console_access_protocol == 'novnc' or console_access_protocol == 'vnc' -%}
+novncproxy_base_url = {{ novnc_proxy_address }}
+{% endif -%}
+{% if console_access_protocol == 'xvpvnc' or console_access_protocol == 'vnc' -%}
+xvpvncproxy_port = {{ xvpvnc_proxy_port }}
+xvpvncproxy_host = {{ xvpvnc_proxy_host }}
+xvpvncproxy_base_url = {{ xvpvnc_proxy_address }}
+{% endif -%}
+{% else -%}
+enabled = False
+{% endif -%}
+
 {% if network_manager == 'neutron' and network_manager_config -%}
 [neutron]
 url = {{ network_manager_config.neutron_url }}

templates/ocata/nova.conf

@@ -11,9 +11,8 @@ verbose={{ verbose }}
 debug={{ debug }}
 dhcpbridge_flagfile=/etc/nova/nova.conf
 dhcpbridge=/usr/bin/nova-dhcpbridge
-logdir=/var/log/nova
+log_dir=/var/log/nova
 state_path=/var/lib/nova
-force_dhcp_release=True
 use_syslog = {{ use_syslog }}
 ec2_private_dns_show_ip=True
 enabled_apis=osapi_compute,metadata
@@ -33,25 +32,6 @@ libvirt_use_virtio_for_bridges=False
 libvirt_disk_prefix=vd
 {% endif -%}
 
-{% if console_vnc_type -%}
-vnc_enabled = True
-novnc_enabled = True
-vnc_keymap = {{ console_keymap }}
-vncserver_listen = {{ console_listen_addr }}
-vncserver_proxyclient_address = {{ console_listen_addr }}
-{% if console_access_protocol == 'novnc' or console_access_protocol == 'vnc' -%}
-novncproxy_base_url = {{ novnc_proxy_address }}
-{% endif -%}
-{% if console_access_protocol == 'xvpvnc' or console_access_protocol == 'vnc' -%}
-xvpvncproxy_port = {{ xvpvnc_proxy_port }}
-xvpvncproxy_host = {{ xvpvnc_proxy_host }}
-xvpvncproxy_base_url = {{ xvpvnc_proxy_address }}
-{% endif -%}
-{% else -%}
-vnc_enabled = False
-novnc_enabled = False
-{% endif -%}
-
 {% if neutron_plugin and neutron_plugin in ('ovs', 'midonet') -%}
 libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtGenericVIFDriver
 {% if neutron_security_groups -%}
@@ -92,7 +72,6 @@ firewall_driver = nova.virt.firewall.NoopFirewallDriver
 
 {% if network_manager == 'neutron' -%}
 network_api_class = nova.network.neutronv2.api.API
-use_neutron = True
 {% else -%}
 network_manager = nova.network.manager.FlatDHCPManager
 {% endif -%}
@@ -149,6 +128,24 @@ resume_guests_state_on_host_boot = {{ resume_guests_state_on_host_boot }}
 
 metadata_workers = {{ workers }}
 
+[vnc]
+{% if console_vnc_type -%}
+enabled = True
+keymap = {{ console_keymap }}
+vncserver_listen = {{ console_listen_addr }}
+vncserver_proxyclient_address = {{ console_listen_addr }}
+{% if console_access_protocol == 'novnc' or console_access_protocol == 'vnc' -%}
+novncproxy_base_url = {{ novnc_proxy_address }}
+{% endif -%}
+{% if console_access_protocol == 'xvpvnc' or console_access_protocol == 'vnc' -%}
+xvpvncproxy_port = {{ xvpvnc_proxy_port }}
+xvpvncproxy_host = {{ xvpvnc_proxy_host }}
+xvpvncproxy_base_url = {{ xvpvnc_proxy_address }}
+{% endif -%}
+{% else -%}
+enabled = False
+{% endif -%}
+
 {% if network_manager == 'neutron' and network_manager_config -%}
 [neutron]
 url = {{ network_manager_config.neutron_url }}

templates/pike/nova.conf

@@ -9,11 +9,8 @@
 [DEFAULT]
 verbose={{ verbose }}
 debug={{ debug }}
-dhcpbridge_flagfile=/etc/nova/nova.conf
+log_dir=/var/log/nova
-dhcpbridge=/usr/bin/nova-dhcpbridge
-logdir=/var/log/nova
 state_path=/var/lib/nova
-force_dhcp_release=True
 use_syslog = {{ use_syslog }}
 ec2_private_dns_show_ip=True
 enabled_apis=osapi_compute,metadata
@@ -33,30 +30,10 @@ libvirt_use_virtio_for_bridges=False
 libvirt_disk_prefix=vd
 {% endif -%}
 
-{% if console_vnc_type -%}
-vnc_enabled = True
-novnc_enabled = True
-vnc_keymap = {{ console_keymap }}
-vncserver_listen = {{ console_listen_addr }}
-vncserver_proxyclient_address = {{ console_listen_addr }}
-{% if console_access_protocol == 'novnc' or console_access_protocol == 'vnc' -%}
-novncproxy_base_url = {{ novnc_proxy_address }}
-{% endif -%}
-{% if console_access_protocol == 'xvpvnc' or console_access_protocol == 'vnc' -%}
-xvpvncproxy_port = {{ xvpvnc_proxy_port }}
-xvpvncproxy_host = {{ xvpvnc_proxy_host }}
-xvpvncproxy_base_url = {{ xvpvnc_proxy_address }}
-{% endif -%}
-{% else -%}
-vnc_enabled = False
-novnc_enabled = False
-{% endif -%}
-
 {% if neutron_plugin and neutron_plugin in ('ovs', 'midonet') -%}
 libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtGenericVIFDriver
 {% if neutron_security_groups -%}
 security_group_api = neutron
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
 {% endif -%}
 {% endif -%}
 
@@ -65,23 +42,19 @@ network_api_class=nova.network.neutronv2.api.API
 libvirt_vif_driver=nova.virt.libvirt.vif.LibvirtGenericVIFDriver
 neutron_ovs_bridge=alubr0
 security_group_api=neutron
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
 {% endif -%}
 
 {% if neutron_plugin and (neutron_plugin == 'nvp' or neutron_plugin == 'nsx') -%}
 libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtOpenVswitchVirtualPortDriver
 security_group_api = neutron
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
 {% endif -%}
 
 {% if neutron_plugin and neutron_plugin == 'Calico' -%}
 security_group_api = neutron
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
 {% endif -%}
 
 {% if neutron_plugin and neutron_plugin == 'plumgrid' -%}
 security_group_api=neutron
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
 {% endif -%}
 
 {% if network_manager != 'neutron' and network_manager_config -%}
@@ -92,7 +65,6 @@ firewall_driver = nova.virt.firewall.NoopFirewallDriver
 
 {% if network_manager == 'neutron' -%}
 network_api_class = nova.network.neutronv2.api.API
-use_neutron = True
 {% else -%}
 network_manager = nova.network.manager.FlatDHCPManager
 {% endif -%}
@@ -144,6 +116,24 @@ resume_guests_state_on_host_boot = {{ resume_guests_state_on_host_boot }}
 
 metadata_workers = {{ workers }}
 
+[vnc]
+{% if console_vnc_type -%}
+enabled = True
+keymap = {{ console_keymap }}
+vncserver_listen = {{ console_listen_addr }}
+vncserver_proxyclient_address = {{ console_listen_addr }}
+{% if console_access_protocol == 'novnc' or console_access_protocol == 'vnc' -%}
+novncproxy_base_url = {{ novnc_proxy_address }}
+{% endif -%}
+{% if console_access_protocol == 'xvpvnc' or console_access_protocol == 'vnc' -%}
+xvpvncproxy_port = {{ xvpvnc_proxy_port }}
+xvpvncproxy_host = {{ xvpvnc_proxy_host }}
+xvpvncproxy_base_url = {{ xvpvnc_proxy_address }}
+{% endif -%}
+{% else -%}
+enabled = False
+{% endif -%}
+
 [pci]
 {% if pci_passthrough_whitelist -%}
 passthrough_whitelist = {{ pci_passthrough_whitelist }}

templates/queens/nova.conf

@@ -9,11 +9,8 @@
 [DEFAULT]
 verbose={{ verbose }}
 debug={{ debug }}
-dhcpbridge_flagfile=/etc/nova/nova.conf
+log_dir=/var/log/nova
-dhcpbridge=/usr/bin/nova-dhcpbridge
-logdir=/var/log/nova
 state_path=/var/lib/nova
-force_dhcp_release=True
 use_syslog = {{ use_syslog }}
 ec2_private_dns_show_ip=True
 enabled_apis=osapi_compute,metadata
@@ -33,30 +30,10 @@ libvirt_use_virtio_for_bridges=False
 libvirt_disk_prefix=vd
 {% endif -%}
 
-{% if console_vnc_type -%}
-vnc_enabled = True
-novnc_enabled = True
-vnc_keymap = {{ console_keymap }}
-vncserver_listen = {{ console_listen_addr }}
-vncserver_proxyclient_address = {{ console_listen_addr }}
-{% if console_access_protocol == 'novnc' or console_access_protocol == 'vnc' -%}
-novncproxy_base_url = {{ novnc_proxy_address }}
-{% endif -%}
-{% if console_access_protocol == 'xvpvnc' or console_access_protocol == 'vnc' -%}
-xvpvncproxy_port = {{ xvpvnc_proxy_port }}
-xvpvncproxy_host = {{ xvpvnc_proxy_host }}
-xvpvncproxy_base_url = {{ xvpvnc_proxy_address }}
-{% endif -%}
-{% else -%}
-vnc_enabled = False
-novnc_enabled = False
-{% endif -%}
-
 {% if neutron_plugin and neutron_plugin in ('ovs', 'midonet') -%}
 libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtGenericVIFDriver
 {% if neutron_security_groups -%}
 security_group_api = neutron
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
 {% endif -%}
 {% endif -%}
 
@@ -65,23 +42,19 @@ network_api_class=nova.network.neutronv2.api.API
 libvirt_vif_driver=nova.virt.libvirt.vif.LibvirtGenericVIFDriver
 neutron_ovs_bridge=alubr0
 security_group_api=neutron
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
 {% endif -%}
 
 {% if neutron_plugin and (neutron_plugin == 'nvp' or neutron_plugin == 'nsx') -%}
 libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtOpenVswitchVirtualPortDriver
 security_group_api = neutron
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
 {% endif -%}
 
 {% if neutron_plugin and neutron_plugin == 'Calico' -%}
 security_group_api = neutron
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
 {% endif -%}
 
 {% if neutron_plugin and neutron_plugin == 'plumgrid' -%}
 security_group_api=neutron
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
 {% endif -%}
 
 {% if network_manager != 'neutron' and network_manager_config -%}
@@ -92,7 +65,6 @@ firewall_driver = nova.virt.firewall.NoopFirewallDriver
 
 {% if network_manager == 'neutron' -%}
 network_api_class = nova.network.neutronv2.api.API
-use_neutron = True
 {% else -%}
 network_manager = nova.network.manager.FlatDHCPManager
 {% endif -%}
@@ -144,6 +116,24 @@ resume_guests_state_on_host_boot = {{ resume_guests_state_on_host_boot }}
 
 metadata_workers = {{ workers }}
 
+[vnc]
+{% if console_vnc_type -%}
+enabled = True
+keymap = {{ console_keymap }}
+vncserver_listen = {{ console_listen_addr }}
+vncserver_proxyclient_address = {{ console_listen_addr }}
+{% if console_access_protocol == 'novnc' or console_access_protocol == 'vnc' -%}
+novncproxy_base_url = {{ novnc_proxy_address }}
+{% endif -%}
+{% if console_access_protocol == 'xvpvnc' or console_access_protocol == 'vnc' -%}
+xvpvncproxy_port = {{ xvpvnc_proxy_port }}
+xvpvncproxy_host = {{ xvpvnc_proxy_host }}
+xvpvncproxy_base_url = {{ xvpvnc_proxy_address }}
+{% endif -%}
+{% else -%}
+enabled = False
+{% endif -%}
+
 [pci]
 {% if pci_passthrough_whitelist -%}
 passthrough_whitelist = {{ pci_passthrough_whitelist }}

templates/rocky/nova.conf

@@ -9,11 +9,8 @@
 [DEFAULT]
 verbose={{ verbose }}
 debug={{ debug }}
-dhcpbridge_flagfile=/etc/nova/nova.conf
+log_dir=/var/log/nova
-dhcpbridge=/usr/bin/nova-dhcpbridge
-logdir=/var/log/nova
 state_path=/var/lib/nova
-force_dhcp_release=True
 use_syslog = {{ use_syslog }}
 ec2_private_dns_show_ip=True
 enabled_apis=osapi_compute,metadata
@@ -33,30 +30,10 @@ libvirt_use_virtio_for_bridges=False
 libvirt_disk_prefix=vd
 {% endif -%}
 
-{% if console_vnc_type -%}
-vnc_enabled = True
-novnc_enabled = True
-vnc_keymap = {{ console_keymap }}
-vncserver_listen = {{ console_listen_addr }}
-vncserver_proxyclient_address = {{ console_listen_addr }}
-{% if console_access_protocol == 'novnc' or console_access_protocol == 'vnc' -%}
-novncproxy_base_url = {{ novnc_proxy_address }}
-{% endif -%}
-{% if console_access_protocol == 'xvpvnc' or console_access_protocol == 'vnc' -%}
-xvpvncproxy_port = {{ xvpvnc_proxy_port }}
-xvpvncproxy_host = {{ xvpvnc_proxy_host }}
-xvpvncproxy_base_url = {{ xvpvnc_proxy_address }}
-{% endif -%}
-{% else -%}
-vnc_enabled = False
-novnc_enabled = False
-{% endif -%}
-
 {% if neutron_plugin and neutron_plugin in ('ovs', 'midonet') -%}
 libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtGenericVIFDriver
 {% if neutron_security_groups -%}
 security_group_api = neutron
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
 {% endif -%}
 {% endif -%}
 
@@ -65,23 +42,19 @@ network_api_class=nova.network.neutronv2.api.API
 libvirt_vif_driver=nova.virt.libvirt.vif.LibvirtGenericVIFDriver
 neutron_ovs_bridge=alubr0
 security_group_api=neutron
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
 {% endif -%}
 
 {% if neutron_plugin and (neutron_plugin == 'nvp' or neutron_plugin == 'nsx') -%}
 libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtOpenVswitchVirtualPortDriver
 security_group_api = neutron
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
 {% endif -%}
 
 {% if neutron_plugin and neutron_plugin == 'Calico' -%}
 security_group_api = neutron
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
 {% endif -%}
 
 {% if neutron_plugin and neutron_plugin == 'plumgrid' -%}
 security_group_api=neutron
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
 {% endif -%}
 
 {% if network_manager != 'neutron' and network_manager_config -%}
@@ -92,7 +65,6 @@ firewall_driver = nova.virt.firewall.NoopFirewallDriver
 
 {% if network_manager == 'neutron' -%}
 network_api_class = nova.network.neutronv2.api.API
-use_neutron = True
 {% else -%}
 network_manager = nova.network.manager.FlatDHCPManager
 {% endif -%}
@@ -144,6 +116,24 @@ resume_guests_state_on_host_boot = {{ resume_guests_state_on_host_boot }}
 
 metadata_workers = {{ workers }}
 
+[vnc]
+{% if console_vnc_type -%}
+enabled = True
+keymap = {{ console_keymap }}
+vncserver_listen = {{ console_listen_addr }}
+vncserver_proxyclient_address = {{ console_listen_addr }}
+{% if console_access_protocol == 'novnc' or console_access_protocol == 'vnc' -%}
+novncproxy_base_url = {{ novnc_proxy_address }}
+{% endif -%}
+{% if console_access_protocol == 'xvpvnc' or console_access_protocol == 'vnc' -%}
+xvpvncproxy_port = {{ xvpvnc_proxy_port }}
+xvpvncproxy_host = {{ xvpvnc_proxy_host }}
+xvpvncproxy_base_url = {{ xvpvnc_proxy_address }}
+{% endif -%}
+{% else -%}
+enabled = False
+{% endif -%}
+
 [pci]
 {% if pci_passthrough_whitelist -%}
 passthrough_whitelist = {{ pci_passthrough_whitelist }}

templates/stein/nova.conf

@@ -9,11 +9,8 @@
 [DEFAULT]
 verbose={{ verbose }}
 debug={{ debug }}
-dhcpbridge_flagfile=/etc/nova/nova.conf
+log_dir=/var/log/nova
-dhcpbridge=/usr/bin/nova-dhcpbridge
-logdir=/var/log/nova
 state_path=/var/lib/nova
-force_dhcp_release=True
 use_syslog = {{ use_syslog }}
 ec2_private_dns_show_ip=True
 enabled_apis=osapi_compute,metadata
@@ -37,30 +34,10 @@ libvirt_use_virtio_for_bridges=False
 libvirt_disk_prefix=vd
 {% endif -%}
 
-{% if console_vnc_type -%}
-vnc_enabled = True
-novnc_enabled = True
-vnc_keymap = {{ console_keymap }}
-vncserver_listen = {{ console_listen_addr }}
-vncserver_proxyclient_address = {{ console_listen_addr }}
-{% if console_access_protocol == 'novnc' or console_access_protocol == 'vnc' -%}
-novncproxy_base_url = {{ novnc_proxy_address }}
-{% endif -%}
-{% if console_access_protocol == 'xvpvnc' or console_access_protocol == 'vnc' -%}
-xvpvncproxy_port = {{ xvpvnc_proxy_port }}
-xvpvncproxy_host = {{ xvpvnc_proxy_host }}
-xvpvncproxy_base_url = {{ xvpvnc_proxy_address }}
-{% endif -%}
-{% else -%}
-vnc_enabled = False
-novnc_enabled = False
-{% endif -%}
-
 {% if neutron_plugin and neutron_plugin in ('ovs', 'midonet') -%}
 libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtGenericVIFDriver
 {% if neutron_security_groups -%}
 security_group_api = neutron
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
 {% endif -%}
 {% endif -%}
 
@@ -69,23 +46,19 @@ network_api_class=nova.network.neutronv2.api.API
 libvirt_vif_driver=nova.virt.libvirt.vif.LibvirtGenericVIFDriver
 neutron_ovs_bridge=alubr0
 security_group_api=neutron
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
 {% endif -%}
 
 {% if neutron_plugin and (neutron_plugin == 'nvp' or neutron_plugin == 'nsx') -%}
 libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtOpenVswitchVirtualPortDriver
 security_group_api = neutron
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
 {% endif -%}
 
 {% if neutron_plugin and neutron_plugin == 'Calico' -%}
 security_group_api = neutron
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
 {% endif -%}
 
 {% if neutron_plugin and neutron_plugin == 'plumgrid' -%}
 security_group_api=neutron
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
 {% endif -%}
 
 {% if network_manager != 'neutron' and network_manager_config -%}
@@ -96,7 +69,6 @@ firewall_driver = nova.virt.firewall.NoopFirewallDriver
 
 {% if network_manager == 'neutron' -%}
 network_api_class = nova.network.neutronv2.api.API
-use_neutron = True
 {% else -%}
 network_manager = nova.network.manager.FlatDHCPManager
 {% endif -%}
@@ -148,6 +120,24 @@ resume_guests_state_on_host_boot = {{ resume_guests_state_on_host_boot }}
 
 metadata_workers = {{ workers }}
 
+[vnc]
+{% if console_vnc_type -%}
+enabled = True
+keymap = {{ console_keymap }}
+vncserver_listen = {{ console_listen_addr }}
+vncserver_proxyclient_address = {{ console_listen_addr }}
+{% if console_access_protocol == 'novnc' or console_access_protocol == 'vnc' -%}
+novncproxy_base_url = {{ novnc_proxy_address }}
+{% endif -%}
+{% if console_access_protocol == 'xvpvnc' or console_access_protocol == 'vnc' -%}
+xvpvncproxy_port = {{ xvpvnc_proxy_port }}
+xvpvncproxy_host = {{ xvpvnc_proxy_host }}
+xvpvncproxy_base_url = {{ xvpvnc_proxy_address }}
+{% endif -%}
+{% else -%}
+enabled = False
+{% endif -%}
+
 [pci]
 {% if pci_passthrough_whitelist -%}
 passthrough_whitelist = {{ pci_passthrough_whitelist }}
@@ -236,8 +226,11 @@ inject_partition = -2
 {% endif -%}
 rbd_user = {{ rbd_user }}
 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 -%}
 {% if live_migration_permit_post_copy -%}
 live_migration_permit_post_copy = {{ live_migration_permit_post_copy }}
@@ -294,7 +287,6 @@ notification_format = unversioned
 lock_path=/var/lock/nova
 
 [workarounds]
-disable_libvirt_livesnapshot = False
 
 {% include "parts/section-ephemeral" %}