diff --git a/doc/src/docbkx/openstack-network-connectivity-admin/app_demo_flat.xml b/doc/src/docbkx/openstack-network-connectivity-admin/app_demo_flat.xml index 83c3317592..5ffd6287d6 100644 --- a/doc/src/docbkx/openstack-network-connectivity-admin/app_demo_flat.xml +++ b/doc/src/docbkx/openstack-network-connectivity-admin/app_demo_flat.xml @@ -134,12 +134,20 @@ Update the OpenStack Networking configuration file, /etc/quantum/quantum.conf: + >/etc/quantum/quantum.conf + setting plugin choice and Identity Service user + as necessary: [DEFAULT] core_plugin = quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2 control_exchange = quantum rabbit_host = controlnode -notification_driver = quantum.openstack.common.notifier.rabbit_notifier +notification_driver = quantum.openstack.common.notifier.rabbit_notifier + +[keystone_authtoken] +admin_tenant_name=servicetenant +admin_user=quantum +admin_password=servicepassword + Update the plugin configuration @@ -151,17 +159,6 @@ sql_connection = mysql://root:root@controlnode:3306/ovs_quantum?charset=utf8 network_vlan_ranges = physnet1 bridge_mappings = physnet1:br-eth0 - - - Update the api-paste - configuration file to include the - OpenStack Identity user, /etc/quantum/api-paste.ini: - [filter:authtoken] -admin_tenant_name=servicetenant -admin_user=quantum -admin_password=servicepassword Start the OpenStack Networking service diff --git a/doc/src/docbkx/openstack-network-connectivity-admin/app_demo_routers_with_private_networks.xml b/doc/src/docbkx/openstack-network-connectivity-admin/app_demo_routers_with_private_networks.xml index 37685aee00..7420134126 100644 --- a/doc/src/docbkx/openstack-network-connectivity-admin/app_demo_routers_with_private_networks.xml +++ b/doc/src/docbkx/openstack-network-connectivity-admin/app_demo_routers_with_private_networks.xml @@ -145,12 +145,19 @@ Update the OpenStack Networking configuration file, /etc/quantum/quantum.conf + >/etc/quantum/quantum.conf, with plugin + choice and Identity Service user as necessary: [DEFAULT] core_plugin = quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2 control_exchange = quantum rabbit_host = controlnode -notification_driver = quantum.openstack.common.notifier.rabbit_notifier +notification_driver = quantum.openstack.common.notifier.rabbit_notifier + +[keystone_authtoken] +admin_tenant_name=servicetenant +admin_user=quantum +admin_password=servicepassword + Update the plugin configuration @@ -163,17 +170,6 @@ tenant_network_type = gre tunnel_id_ranges = 1:1000 enable_tunneling = True - - - Update the api-paste - configuration file to include the - keystone user, /etc/quantum/api-paste.ini - [filter:authtoken] -admin_tenant_name=servicetenant -admin_user=quantum -admin_password=servicepassword Start the OpenStack Networking server