From 44c5ad5167e1c2316aa7f2dbe65d7981d9afbbeb Mon Sep 17 00:00:00 2001 From: Stephen Gordon Date: Sat, 12 Oct 2013 16:04:18 -0400 Subject: [PATCH] Use consistent RabbitMQ settings across guide. Use consistent values for rabbit_host, rabbit_userid, and rabbit_password across the guide. Previously there were a number of variations, particularly of the host and password values. In a subsequent patch I intend to cover off the fact that RabbitMQ is installed/configured in at least two locations. I may depending on feedback also end up adding an instruction to set the guest user's password in which case a further update to rabbit_password will be required. I think just getting the initial values to base this work on consistent, as I am proposing in this patch, is a good start. Where programlisting elements that were touched use "bash" as the language I have also flipped them to "ini". Change-Id: Ie3779db58f8a397753a9a2409bd838ea97a87568 --- doc/install-guide/ch_installnetworking.xml | 2 +- doc/install-guide/section_cinder-install.xml | 12 ++++++------ ...king-per-tenant-routers-with-private-networks.xml | 6 +++--- ...working-provider-router-with-private_networks.xml | 12 ++++++------ doc/install-guide/section_networking-single-flat.xml | 6 +++--- doc/install-guide/section_nova-compute.xml | 4 ++-- doc/install-guide/section_nova-controller.xml | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/doc/install-guide/ch_installnetworking.xml b/doc/install-guide/ch_installnetworking.xml index e95eb5da80..a37499dfab 100644 --- a/doc/install-guide/ch_installnetworking.xml +++ b/doc/install-guide/ch_installnetworking.xml @@ -182,7 +182,7 @@ Example neutron.conf file for NVP: core_plugin = neutron.plugins.nicira.NeutronPlugin.NvpPluginV2 -rabbit_host = 192.168.203.10 +rabbit_host = controller allow_overlapping_ips = True diff --git a/doc/install-guide/section_cinder-install.xml b/doc/install-guide/section_cinder-install.xml index a151481762..5309012320 100644 --- a/doc/install-guide/section_cinder-install.xml +++ b/doc/install-guide/section_cinder-install.xml @@ -45,20 +45,20 @@ auth_strategy = keystone #osapi_volume_listen_port=5900 Configure messaging also in /etc/cinder/cinder.conf. -rabbit_host = 10.10.10.10 +rabbit_host = controller rabbit_port = 5672 # Change the following settings if you're not using the default RabbitMQ configuration -#rabbit_userid = rabbit -#rabbit_password = secure_password +#rabbit_userid = guest +#rabbit_password = guest #rabbit_virtual_host = /nova qpid_hostname=192.168.206.130 -rabbit_host = 10.10.10.10 +rabbit_host = controller rabbit_port = 5672 # Change the following settings if you're not using the default RabbitMQ configuration -#rabbit_userid = rabbit -#rabbit_password = secure_password +#rabbit_userid = guest +#rabbit_password = guest #rabbit_virtual_host = /nova Verify entries in /etc/nova/nova.conf. The volume_api_class setting is the default setting since diff --git a/doc/install-guide/section_networking-per-tenant-routers-with-private-networks.xml b/doc/install-guide/section_networking-per-tenant-routers-with-private-networks.xml index f71c3f63c5..5947aa6749 100644 --- a/doc/install-guide/section_networking-per-tenant-routers-with-private-networks.xml +++ b/doc/install-guide/section_networking-per-tenant-routers-with-private-networks.xml @@ -189,7 +189,7 @@ [DEFAULT] core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 control_exchange = neutron -rabbit_host = controlnode +rabbit_host = controller notification_driver = neutron.openstack.common.notifier.rabbit_notifier [keystone_authtoken] @@ -280,7 +280,7 @@ libvirt_vif_driver=nova.virt.libvirt.vif.LibvirtHybridOVSBridgeDriver [DEFAULT] core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 control_exchange = neutron -rabbit_host = controlnode +rabbit_host = controller notification_driver = neutron.openstack.common.notifier.rabbit_notifier @@ -341,7 +341,7 @@ local_ip = 9.181.89.203 [DEFAULT] core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 control_exchange = neutron -rabbit_host = controlnode +rabbit_host = controller notification_driver = neutron.openstack.common.notifier.rabbit_notifier allow_overlapping_ips = True Set diff --git a/doc/install-guide/section_networking-provider-router-with-private_networks.xml b/doc/install-guide/section_networking-provider-router-with-private_networks.xml index d835cab8c5..07e1b194e3 100644 --- a/doc/install-guide/section_networking-provider-router-with-private_networks.xml +++ b/doc/install-guide/section_networking-provider-router-with-private_networks.xml @@ -104,10 +104,10 @@ Edit file /etc/neutron/neutron.conf and modify: -core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 +core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 auth_strategy = keystone fake_rabbit = False -rabbit_password = password +rabbit_password = guest @@ -160,8 +160,8 @@ neutron-dhcp-agent neutron-l3-agent Update the OpenStack Networking configuration file, /etc/neutron/neutron.conf: - rabbit_password = password -rabbit_host = 192.168.0.1 + rabbit_password = guest +rabbit_host = controller Update the plugin configuration file, @@ -254,8 +254,8 @@ admin_password = password Update the OpenStack Networking configuration file /etc/neutron/neutron.conf: - rabbit_password = password -rabbit_host = 192.168.0.1 + rabbit_password = guest +rabbit_host = controller Update the file diff --git a/doc/install-guide/section_networking-single-flat.xml b/doc/install-guide/section_networking-single-flat.xml index 58a5a950f3..fbbae58911 100644 --- a/doc/install-guide/section_networking-single-flat.xml +++ b/doc/install-guide/section_networking-single-flat.xml @@ -132,7 +132,7 @@ [DEFAULT] core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 control_exchange = neutron -rabbit_host = controlnode +rabbit_host = controller notification_driver = neutron.openstack.common.notifier.rabbit_notifier [keystone_authtoken] @@ -200,7 +200,7 @@ libvirt_vif_driver=nova.virt.libvirt.vif.LibvirtHybridOVSBridgeDriver [DEFAULT] core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 control_exchange = neutron -rabbit_host = controlnode +rabbit_host = controller notification_driver = neutron.openstack.common.notifier.rabbit_notifier @@ -237,7 +237,7 @@ bridge_mappings = physnet1:br-eth0 [DEFAULT] core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 control_exchange = neutron -rabbit_host = controlnode +rabbit_host = controller notification_driver = neutron.openstack.common.notifier.rabbit_notifier diff --git a/doc/install-guide/section_nova-compute.xml b/doc/install-guide/section_nova-compute.xml index ff112f23a5..94e87c20d2 100644 --- a/doc/install-guide/section_nova-compute.xml +++ b/doc/install-guide/section_nova-compute.xml @@ -71,8 +71,8 @@ auth_strategy=keystone message broker by setting the following configuration keys. They are found in the DEFAULT configuration group of the /etc/nova/nova.conf file. - rpc_backend = nova.rpc.impl_kombu -rabbit_host = controller + rpc_backend = nova.rpc.impl_kombu +rabbit_host = controller Set the configuration keys my_ip, diff --git a/doc/install-guide/section_nova-controller.xml b/doc/install-guide/section_nova-controller.xml index e446637cc6..ac533de4ab 100644 --- a/doc/install-guide/section_nova-controller.xml +++ b/doc/install-guide/section_nova-controller.xml @@ -169,8 +169,8 @@ admin_password=NOVA_DBPASS Configure the Compute Service to use the RabbitMQ message broker by setting the following configuration keys. Add them in the DEFAULT configuration group of the /etc/nova/nova.conf file. - rpc_backend = nova.rpc.impl_kombu -rabbit_host = controller + rpc_backend = nova.rpc.impl_kombu +rabbit_host = controller Configure the Compute Service to use the RabbitMQ