openstack/openstack-manuals
Code Issues Proposed changes

Merge "Use consistent RabbitMQ settings across guide."

Browse Source
This commit is contained in:
Jenkins 2013-10-14 21:11:54 +00:00 committed by Gerrit Code Review
commit 8c6292344c
7 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/install-guide/ch_installnetworking.xml
View File

@ -182,7 +182,7 @@
<para>Example <filename>neutron.conf</filename> file for <para>Example <filename>neutron.conf</filename> file for
NVP:</para> NVP:</para>
<screen><computeroutput>core_plugin = neutron.plugins.nicira.NeutronPlugin.NvpPluginV2</computeroutput> <screen><computeroutput>core_plugin = neutron.plugins.nicira.NeutronPlugin.NvpPluginV2</computeroutput>
<computeroutput>rabbit_host = 192.168.203.10</computeroutput> <computeroutput>rabbit_host = controller</computeroutput>
<computeroutput>allow_overlapping_ips = True</computeroutput></screen> <computeroutput>allow_overlapping_ips = True</computeroutput></screen>
</step> </step>
<step> <step>

12
doc/install-guide/section_cinder-install.xml
View File

@ -45,20 +45,20 @@ auth_strategy = keystone
#osapi_volume_listen_port=5900</programlisting> #osapi_volume_listen_port=5900</programlisting>
<para>Configure messaging also in <filename>/etc/cinder/cinder.conf</filename>.</para> <para>Configure messaging also in <filename>/etc/cinder/cinder.conf</filename>.</para>
<programlisting os="ubuntu"> <programlisting os="ubuntu">
rabbit_host = 10.10.10.10 rabbit_host = controller
rabbit_port = 5672 rabbit_port = 5672
# Change the following settings if you're not using the default RabbitMQ configuration # Change the following settings if you're not using the default RabbitMQ configuration
#rabbit_userid = rabbit #rabbit_userid = guest
#rabbit_password = secure_password #rabbit_password = guest
#rabbit_virtual_host = /nova</programlisting> #rabbit_virtual_host = /nova</programlisting>
<programlisting os="rhel;centos;fedora"> <programlisting os="rhel;centos;fedora">
qpid_hostname = controller</programlisting> qpid_hostname = controller</programlisting>
<programlisting os="opensuse"> <programlisting os="opensuse">
rabbit_host = 10.10.10.10 rabbit_host = controller
rabbit_port = 5672 rabbit_port = 5672
# Change the following settings if you're not using the default RabbitMQ configuration # Change the following settings if you're not using the default RabbitMQ configuration
#rabbit_userid = rabbit #rabbit_userid = guest
#rabbit_password = secure_password #rabbit_password = guest
#rabbit_virtual_host = /nova</programlisting> #rabbit_virtual_host = /nova</programlisting>
<para>Verify entries in <filename>/etc/nova/nova.conf</filename>. The <para>Verify entries in <filename>/etc/nova/nova.conf</filename>. The
<literal>volume_api_class</literal> setting is the default setting since <literal>volume_api_class</literal> setting is the default setting since

6
doc/install-guide/section_networking-per-tenant-routers-with-private-networks.xml
View File

@ -189,7 +189,7 @@
<programlisting>[DEFAULT] <programlisting>[DEFAULT]
core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2
control_exchange = neutron control_exchange = neutron
rabbit_host = controlnode rabbit_host = controller
notification_driver = neutron.openstack.common.notifier.rabbit_notifier notification_driver = neutron.openstack.common.notifier.rabbit_notifier
[keystone_authtoken] [keystone_authtoken]
@ -280,7 +280,7 @@ libvirt_vif_driver=nova.virt.libvirt.vif.LibvirtHybridOVSBridgeDriver
<programlisting language="ini">[DEFAULT] <programlisting language="ini">[DEFAULT]
core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2
control_exchange = neutron control_exchange = neutron
rabbit_host = controlnode rabbit_host = controller
notification_driver = neutron.openstack.common.notifier.rabbit_notifier notification_driver = neutron.openstack.common.notifier.rabbit_notifier
</programlisting> </programlisting>
</listitem> </listitem>
@ -341,7 +341,7 @@ local_ip = 9.181.89.203
<programlisting>[DEFAULT] <programlisting>[DEFAULT]
core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2
control_exchange = neutron control_exchange = neutron
rabbit_host = controlnode rabbit_host = controller
notification_driver = neutron.openstack.common.notifier.rabbit_notifier notification_driver = neutron.openstack.common.notifier.rabbit_notifier
allow_overlapping_ips = True</programlisting> allow_overlapping_ips = True</programlisting>
<para><emphasis role="bold">Set <para><emphasis role="bold">Set

12
doc/install-guide/section_networking-provider-router-with-private_networks.xml
View File

@ -104,10 +104,10 @@
<listitem> <listitem>
<para>Edit file <filename>/etc/neutron/neutron.conf</filename> <para>Edit file <filename>/etc/neutron/neutron.conf</filename>
and modify: and modify:
<programlisting language="bash">core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 <programlisting language="ini">core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2
auth_strategy = keystone auth_strategy = keystone
fake_rabbit = False fake_rabbit = False
rabbit_password = password</programlisting> rabbit_password = guest</programlisting>
</para> </para>
</listitem> </listitem>
<listitem> <listitem>
@ -160,8 +160,8 @@ neutron-dhcp-agent neutron-l3-agent</userinput></screen>
<para>Update the OpenStack Networking <para>Update the OpenStack Networking
configuration file, <filename> configuration file, <filename>
/etc/neutron/neutron.conf</filename>:</para> /etc/neutron/neutron.conf</filename>:</para>
<programlisting language="bash">rabbit_password = password <programlisting language="ini">rabbit_password = guest
rabbit_host = 192.168.0.1</programlisting> rabbit_host = controller</programlisting>
</step> </step>
<step> <step>
<para>Update the plugin configuration file, <para>Update the plugin configuration file,
@ -254,8 +254,8 @@ admin_password = password</programlisting>
<para>Update the OpenStack Networking <para>Update the OpenStack Networking
configuration file <filename> configuration file <filename>
/etc/neutron/neutron.conf</filename>:</para> /etc/neutron/neutron.conf</filename>:</para>
<programlisting language="bash">rabbit_password = password <programlisting language="ini">rabbit_password = guest
rabbit_host = 192.168.0.1</programlisting> rabbit_host = controller</programlisting>
</step> </step>
<step> <step>
<para>Update the file <filename> <para>Update the file <filename>

6
doc/install-guide/section_networking-single-flat.xml
View File

@ -132,7 +132,7 @@
<programlisting>[DEFAULT] <programlisting>[DEFAULT]
core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2
control_exchange = neutron control_exchange = neutron
rabbit_host = controlnode rabbit_host = controller
notification_driver = neutron.openstack.common.notifier.rabbit_notifier notification_driver = neutron.openstack.common.notifier.rabbit_notifier
[keystone_authtoken] [keystone_authtoken]
@ -200,7 +200,7 @@ libvirt_vif_driver=nova.virt.libvirt.vif.LibvirtHybridOVSBridgeDriver
<programlisting>[DEFAULT] <programlisting>[DEFAULT]
core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2
control_exchange = neutron control_exchange = neutron
rabbit_host = controlnode rabbit_host = controller
notification_driver = neutron.openstack.common.notifier.rabbit_notifier</programlisting> notification_driver = neutron.openstack.common.notifier.rabbit_notifier</programlisting>
</listitem> </listitem>
<listitem> <listitem>
@ -237,7 +237,7 @@ bridge_mappings = physnet1:br-eth0</programlisting>
<programlisting>[DEFAULT] <programlisting>[DEFAULT]
core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2
control_exchange = neutron control_exchange = neutron
rabbit_host = controlnode rabbit_host = controller
notification_driver = neutron.openstack.common.notifier.rabbit_notifier</programlisting> notification_driver = neutron.openstack.common.notifier.rabbit_notifier</programlisting>
</listitem> </listitem>
<listitem> <listitem>

4
doc/install-guide/section_nova-compute.xml
View File

@ -71,8 +71,8 @@ auth_strategy=keystone</programlisting>
message broker by setting the following configuration keys. They are found in message broker by setting the following configuration keys. They are found in
the <literal>DEFAULT</literal> configuration group of the the <literal>DEFAULT</literal> configuration group of the
<filename>/etc/nova/nova.conf</filename> file.</para> <filename>/etc/nova/nova.conf</filename> file.</para>
<screen os="ubuntu;debian">rpc_backend = nova.rpc.impl_kombu <programlisting os="ubuntu;debian" language="ini">rpc_backend = nova.rpc.impl_kombu
rabbit_host = controller</screen> rabbit_host = controller</programlisting>
</step> </step>
<step><para>Set the configuration keys <literal>my_ip</literal>, <step><para>Set the configuration keys <literal>my_ip</literal>,

4
doc/install-guide/section_nova-controller.xml
View File

@ -169,8 +169,8 @@ admin_password=<replaceable>NOVA_DBPASS</replaceable>
<para>Configure the Compute Service to use the RabbitMQ <para>Configure the Compute Service to use the RabbitMQ
message broker by setting the following configuration keys. Add them in the <literal>DEFAULT</literal> configuration group of the message broker by setting the following configuration keys. Add them in the <literal>DEFAULT</literal> configuration group of the
<filename>/etc/nova/nova.conf</filename> file.</para> <filename>/etc/nova/nova.conf</filename> file.</para>
<screen>rpc_backend = nova.rpc.impl_kombu <programlisting language="ini">rpc_backend = nova.rpc.impl_kombu
rabbit_host = controller</screen> rabbit_host = controller</programlisting>
</step> </step>
<step os="opensuse"> <step os="opensuse">
<para>Configure the Compute Service to use the RabbitMQ <para>Configure the Compute Service to use the RabbitMQ