From 5cee4b34faa511a73a88a40a4e8994f053f3cc6c Mon Sep 17 00:00:00 2001 From: JangYeHoon Date: Thu, 25 Apr 2024 08:17:20 +0000 Subject: [PATCH] Remove and modify outdated options in DHCP HA documentation A database option has been added to neutron.conf. Removed the old options rabbit_host and rabbit_password in neutron.conf. Removed outdated options use_neutron and firewall_driver from linuxbridge_conf.ini. The admin_ option used in the neutron part of linuxbridge_conf.ini has been updated to the latest. Modify tenant_name to project_name in the neutron part of linuxbridge_conf.ini Closes-Bug: #2042647 Change-Id: I3f4538e1e63fb316425ef7c6ab5c53a0a74f739f --- doc/source/admin/config-dhcp-ha.rst | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/doc/source/admin/config-dhcp-ha.rst b/doc/source/admin/config-dhcp-ha.rst index ca6637670e4..4eeffb7ea40 100644 --- a/doc/source/admin/config-dhcp-ha.rst +++ b/doc/source/admin/config-dhcp-ha.rst @@ -93,11 +93,13 @@ Configuration [DEFAULT] core_plugin = linuxbridge - rabbit_host = controlnode host = controlnode agent_down_time = 5 dhcp_agents_per_network = 1 + [database] + connection = mysql+pymysql://root:root@127.0.0.1:3306/neutron + .. note:: In the above configuration, we use ``dhcp_agents_per_network = 1`` @@ -127,11 +129,12 @@ Configuration .. code-block:: ini [DEFAULT] - rabbit_host = controlnode - rabbit_password = openstack # host = HostB on hostb host = HostA + [database] + connection = mysql+pymysql://root:root@127.0.0.1:3306/neutron + #. Update the plug-in configuration file ``/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini``: @@ -150,16 +153,12 @@ Configuration .. code-block:: ini - [DEFAULT] - use_neutron=True - firewall_driver=nova.virt.firewall.NoopFirewallDriver - [neutron] - admin_username=neutron - admin_password=servicepassword - admin_auth_url=http://controlnode:35357/v2.0/ + username=neutron + password=servicepassword + auth_url=http://controlnode:35357/v2.0/ auth_strategy=keystone - admin_tenant_name=servicetenant + project_name=servicetenant url=http://203.0.113.10:9696/ **HostA and HostB: DHCP agent**