openstack/openstack-manuals
Code Issues Proposed changes

Merge "[install] Remove neutron workaround for Ubuntu"

Browse Source
This commit is contained in:
Jenkins
2015-10-07 02:56:21 +00:00
committed by Gerrit Code Review
parent 761da088ff 45e005cbd1
commit f037b4a762
2 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
doc/install-guide/source/neutron-compute-install.rst
View File

@@ -19,7 +19,7 @@ kernel networking parameters to disable reverse-path filtering:
#. Implement the changes:
.. code-block:: ini
.. code-block:: console
# sysctl -p
@@ -262,18 +262,6 @@ Finalize installation
# service nova-compute restart
#. Due to a packaging issue, the Linux bridge agent initialization script
explicitly looks for the ML2 plug-in configuration file rather than the
agent configuration file. Run the following commands to resolve this
issue:
.. code-block:: console
# cp /etc/init/neutron-plugin-linuxbridge-agent.conf \
/etc/init/neutron-plugin-linuxbridge-agent.conf.orig
# sed -i 's,ml2_conf.ini,linuxbridge_agent.ini,g' \
/etc/init/neutron-plugin-linuxbridge-agent.conf
#. Restart the Linux bridge agent:
.. code-block:: console

12
doc/install-guide/source/neutron-controller-install.rst
View File

@@ -359,18 +359,6 @@ Finalize installation
.. only:: ubuntu
#. Due to a packaging issue, the Linux bridge agent initialization script
explicitly looks for the ML2 plug-in configuration file rather than the
agent configuration file. Run the following commands to resolve this
issue:
.. code-block:: console
# cp /etc/init/neutron-plugin-linuxbridge-agent.conf \
/etc/init/neutron-plugin-linuxbridge-agent.conf.orig
# sed -i 's,ml2_conf.ini,linuxbridge_agent.ini,g' \
/etc/init/neutron-plugin-linuxbridge-agent.conf
#. Populate the database:
.. code-block:: console