From 8affa7cfed134fc7438e4e3cf1df660e28d30f58 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sat, 2 Nov 2013 15:24:48 +0100 Subject: [PATCH] Install Guide: Mark content properly as Debian only Some Debian specific content was shown on all systems, add proper os tag. Also, wrap mediaobjects in informalfigures. Change-Id: I83df8d98e7843fd6ee8ce7f0d295473dd79fdf04 backport: havana --- .../section_keystone-install.xml | 66 +++++++++++-------- doc/install-guide/section_neutron-install.xml | 57 +++++++++------- 2 files changed, 73 insertions(+), 50 deletions(-) diff --git a/doc/install-guide/section_keystone-install.xml b/doc/install-guide/section_keystone-install.xml index dd0a468c86..056e2d9e3a 100644 --- a/doc/install-guide/section_keystone-install.xml +++ b/doc/install-guide/section_keystone-install.xml @@ -66,11 +66,13 @@ IDENTIFIED BY 'KEYSTONE_DBPASS'; Fill-in the debconf prompt with the value that will be put in the admin_token directive of keystone.conf. It is recommended to generate this password with openssl rand -hex 10. + + Later on, you can verify that /etc/keystone/keystone.conf contains the password you have set using debconf: @@ -83,41 +85,53 @@ admin_token = ADMIN_TOKEN Answer to the debconf prompts to create an admin tenant. - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + If this is the first time you install Keystone, then you should register Keystone in the Keystone catalogue of services: + + diff --git a/doc/install-guide/section_neutron-install.xml b/doc/install-guide/section_neutron-install.xml index 2bb7825ff4..f91a7a4de8 100644 --- a/doc/install-guide/section_neutron-install.xml +++ b/doc/install-guide/section_neutron-install.xml @@ -12,19 +12,23 @@ when installing any package for the Networking service. When installing a Neutron package, debconf will prompt you to choose configuration options including the plug-in to use: - - - - - - This parameter sets the for the core_plugin option value in the + + + + + + + + This parameter sets the for the + core_plugin option value in the /etc/neutron/neutron.conf file. - When you install the neutron-common package, - all plug-ins are installed by default. - The following table lists the values for the + When you install the neutron-common package, + all plug-ins are installed by default. + + The following table lists the values for the core_plugin option. These values depend on your - answer to the debconf prompt. - + answer to the debconf prompt. +
@@ -87,24 +91,29 @@
Plug-ins and the core_plugin option
- Depending on the value of core_plugin, the - start-up scripts start the daemons by using the corresponding plugin configuration file - as parameter directly. For example, if you selected the Open vSwitch + Depending on the value of + core_plugin, the start-up scripts start the + daemons by using the corresponding plugin configuration file as + parameter directly. For example, if you selected the Open vSwitch plugin, then neutron-server will be launched with --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini automatically. The neutron-common package also prompt you for the default network configuration that you wish to use: - - - - - - - - - - + + + + + + + + + + + + + + Before you configure individual nodes for Neutron, you must perform the initial setup required for any OpenStack component: