From 975a6e20da11ff6bc45166f3ee0466a7fc407236 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Tue, 13 Jun 2017 09:03:58 +0800 Subject: [PATCH] Fix default_floating_pool option Option "default_floating_pool" from group "DEFAULT" is deprecated for removal. use the 'default_floating_pool' option in the '[neutron]' group instead. Change-Id: Ie517a3b33504506cb8da5cb75461ef1ca6fb30ce Closes-Bug: #1697571 --- templates/nova.conf.j2 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2 index 60a46daf..8dbe19ff 100644 --- a/templates/nova.conf.j2 +++ b/templates/nova.conf.j2 @@ -54,8 +54,6 @@ 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 - ## Vif linuxnet_interface_driver = {{ nova_linuxnet_interface_driver }} {% if nova_virt_type in ['kvm', 'lxd', 'qemu', 'xen'] %} @@ -147,6 +145,7 @@ api_servers = {{ nova_glance_api_servers }} url = {{ neutron_service_adminurl }} region_name = {{ neutron_service_region }} auth_type = password +default_floating_pool = public # Keystone client plugin password option password = {{ neutron_service_password }} # Keystone client plugin username option