Removed some duplicate spaces
The duplicate in doc/common/section_getstart_object-storage.xml will be removed with https://review.openstack.org/#/c/106834/ . Change-Id: I1f98a479568be9f07a324e60a2dffb9d348f25e4
This commit is contained in:
@@ -9,7 +9,7 @@
|
|||||||
you design the best configuration for your Compute
|
you design the best configuration for your Compute
|
||||||
instances.</para>
|
instances.</para>
|
||||||
<para>You can choose to either install and configure <systemitem class="service"
|
<para>You can choose to either install and configure <systemitem class="service"
|
||||||
>nova-network</systemitem> for networking between VMs or use the OpenStack Networking
|
>nova-network</systemitem> for networking between VMs or use the OpenStack Networking
|
||||||
service (neutron) for networking. To configure Compute networking options with OpenStack
|
service (neutron) for networking. To configure Compute networking options with OpenStack
|
||||||
Networking, see the <xref linkend="ch_networking"/>.</para>
|
Networking, see the <xref linkend="ch_networking"/>.</para>
|
||||||
<section xml:id="section_networking-options">
|
<section xml:id="section_networking-options">
|
||||||
|
@@ -242,7 +242,7 @@ export OS_AUTH_URL=http://controlnode:5000/v2.0/</programlisting>
|
|||||||
<para>The <command>agent-list</command>
|
<para>The <command>agent-list</command>
|
||||||
command shows details for a specified
|
command shows details for a specified
|
||||||
agent:</para>
|
agent:</para>
|
||||||
<screen><prompt>$</prompt> <userinput>neutron agent-show a0c1c21c-d4f4-4577-9ec7-908f2d48622d</userinput>
|
<screen><prompt>$</prompt> <userinput>neutron agent-show a0c1c21c-d4f4-4577-9ec7-908f2d48622d</userinput>
|
||||||
<computeroutput>+---------------------+----------------------------------------------------------+
|
<computeroutput>+---------------------+----------------------------------------------------------+
|
||||||
| Field | Value |
|
| Field | Value |
|
||||||
+---------------------+----------------------------------------------------------+
|
+---------------------+----------------------------------------------------------+
|
||||||
|
@@ -455,7 +455,7 @@ ovs-vsctl add-port OVS-BR0 vxlan1 -- set Interface vxlan1 type=vxlan options:rem
|
|||||||
implements the Networking abstractions. For information about
|
implements the Networking abstractions. For information about
|
||||||
DHCP and L3 agents, see <xref
|
DHCP and L3 agents, see <xref
|
||||||
linkend="under_the_hood_openvswitch_scenario1"/>.</para>
|
linkend="under_the_hood_openvswitch_scenario1"/>.</para>
|
||||||
<section xml:id="under_the_hood_linuxbridge_configuration">
|
<section xml:id="under_the_hood_linuxbridge_configuration">
|
||||||
<title>Configuration</title>
|
<title>Configuration</title>
|
||||||
<para>This example uses VLAN isolation on the switches to
|
<para>This example uses VLAN isolation on the switches to
|
||||||
isolate tenant networks. This configuration labels the
|
isolate tenant networks. This configuration labels the
|
||||||
|
@@ -290,7 +290,7 @@
|
|||||||
<td>libvirt API driver</td>
|
<td>libvirt API driver</td>
|
||||||
<td>hw_watchdog_action</td>
|
<td>hw_watchdog_action</td>
|
||||||
<td>Enables a virtual hardware watchdog device that carries out the specified action
|
<td>Enables a virtual hardware watchdog device that carries out the specified action
|
||||||
if the server hangs. The watchdog uses the i6300esb device (emulating a PCI
|
if the server hangs. The watchdog uses the i6300esb device (emulating a PCI
|
||||||
Intel 6300ESB). If <literal>hw_watchdog_action</literal> is not specified, the
|
Intel 6300ESB). If <literal>hw_watchdog_action</literal> is not specified, the
|
||||||
watchdog is disabled.</td>
|
watchdog is disabled.</td>
|
||||||
<td><itemizedlist>
|
<td><itemizedlist>
|
||||||
|
@@ -122,7 +122,7 @@
|
|||||||
<procedure>
|
<procedure>
|
||||||
<step>
|
<step>
|
||||||
<para>Attach your volume to a server, specifying the server ID and the volume ID:</para>
|
<para>Attach your volume to a server, specifying the server ID and the volume ID:</para>
|
||||||
<screen><prompt>$</prompt> <userinput>nova volume-attach 84c6e57d-a6b1-44b6-81eb-fcb36afd31b5 573e024d-5235-49ce-8332-be1576d323f8 /dev/vdb</userinput></screen>
|
<screen><prompt>$</prompt> <userinput>nova volume-attach 84c6e57d-a6b1-44b6-81eb-fcb36afd31b5 573e024d-5235-49ce-8332-be1576d323f8 /dev/vdb</userinput></screen>
|
||||||
<screen><?db-font-size 65%?><computeroutput>+----------+--------------------------------------+
|
<screen><?db-font-size 65%?><computeroutput>+----------+--------------------------------------+
|
||||||
| Property | Value |
|
| Property | Value |
|
||||||
+----------+--------------------------------------+
|
+----------+--------------------------------------+
|
||||||
|
@@ -20,7 +20,7 @@
|
|||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term>OpenStack Networking plug-ins and agents</term>
|
<term>OpenStack Networking plug-ins and agents</term>
|
||||||
<listitem><para>Plugs and unplugs ports, creates networks or subnets,
|
<listitem><para>Plugs and unplugs ports, creates networks or subnets,
|
||||||
and provides IP addressing. These plug-ins and agents differ
|
and provides IP addressing. These plug-ins and agents differ
|
||||||
depending on the vendor and technologies used in the particular cloud.
|
depending on the vendor and technologies used in the particular cloud.
|
||||||
OpenStack Networking ships with plug-ins and agents for Cisco
|
OpenStack Networking ships with plug-ins and agents for Cisco
|
||||||
virtual and physical switches, NEC OpenFlow products, Open
|
virtual and physical switches, NEC OpenFlow products, Open
|
||||||
|
@@ -64,7 +64,7 @@
|
|||||||
<term>Token</term>
|
<term>Token</term>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>An alpha-numeric string of text used to access
|
<para>An alpha-numeric string of text used to access
|
||||||
OpenStack APIs and resources. A token may be
|
OpenStack APIs and resources. A token may be
|
||||||
revoked at any time and is valid for a
|
revoked at any time and is valid for a
|
||||||
finite duration.</para>
|
finite duration.</para>
|
||||||
<para>While OpenStack Identity supports token-based
|
<para>While OpenStack Identity supports token-based
|
||||||
|
@@ -14,7 +14,7 @@
|
|||||||
xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
|
xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
|
||||||
xml:id="getting-an-access-url">
|
xml:id="getting-an-access-url">
|
||||||
<title>Get an access URL</title>
|
<title>Get an access URL</title>
|
||||||
<para>The Compute service enables you to create access_urls
|
<para>The Compute service enables you to create access_urls
|
||||||
through the os-consoles extension. Support for accessing this
|
through the os-consoles extension. Support for accessing this
|
||||||
URL is provided by the nova client:</para>
|
URL is provided by the nova client:</para>
|
||||||
<screen><prompt>$</prompt> <userinput>nova get-vnc-console <replaceable>[server_id]</replaceable> <replaceable>[novnc|xvpvnc]</replaceable></userinput></screen>
|
<screen><prompt>$</prompt> <userinput>nova get-vnc-console <replaceable>[server_id]</replaceable> <replaceable>[novnc|xvpvnc]</replaceable></userinput></screen>
|
||||||
|
@@ -108,7 +108,7 @@
|
|||||||
<itemizedlist>
|
<itemizedlist>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>The basic
|
<para>The basic
|
||||||
<glossterm baseform="cloud controller node">controller node</glossterm>
|
<glossterm baseform="cloud controller node">controller node</glossterm>
|
||||||
runs the Identity service, Image Service, management portion of
|
runs the Identity service, Image Service, management portion of
|
||||||
Compute, and the dashboard necessary to launch a simple instance.
|
Compute, and the dashboard necessary to launch a simple instance.
|
||||||
It also includes supporting services such as a database, message
|
It also includes supporting services such as a database, message
|
||||||
|
@@ -23,7 +23,7 @@
|
|||||||
service:</para>
|
service:</para>
|
||||||
<screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install cinder-api cinder-scheduler</userinput></screen>
|
<screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install cinder-api cinder-scheduler</userinput></screen>
|
||||||
<screen os="centos;rhel;fedora"><prompt>#</prompt> <userinput>yum install openstack-cinder</userinput></screen>
|
<screen os="centos;rhel;fedora"><prompt>#</prompt> <userinput>yum install openstack-cinder</userinput></screen>
|
||||||
<screen os="opensuse;sles"><prompt>#</prompt> <userinput>zypper install openstack-cinder-api openstack-cinder-scheduler</userinput></screen>
|
<screen os="opensuse;sles"><prompt>#</prompt> <userinput>zypper install openstack-cinder-api openstack-cinder-scheduler</userinput></screen>
|
||||||
</step>
|
</step>
|
||||||
<step os="debian">
|
<step os="debian">
|
||||||
<para>Respond to the prompts for <link
|
<para>Respond to the prompts for <link
|
||||||
|
@@ -20,7 +20,7 @@
|
|||||||
defined in the <filename>/etc/keystone/policy.json</filename> file.
|
defined in the <filename>/etc/keystone/policy.json</filename> file.
|
||||||
</para>
|
</para>
|
||||||
</note>
|
</note>
|
||||||
<section xml:id="create_role">
|
<section xml:id="create_role">
|
||||||
<title>Create a role</title>
|
<title>Create a role</title>
|
||||||
<procedure>
|
<procedure>
|
||||||
<step>
|
<step>
|
||||||
|
@@ -34,7 +34,7 @@
|
|||||||
(project).</para></listitem>
|
(project).</para></listitem>
|
||||||
<listitem><para><guilabel>Global Object Storage Usage</guilabel> tab to view incoming and outgoing storage bytes per tenant (project).</para></listitem>
|
<listitem><para><guilabel>Global Object Storage Usage</guilabel> tab to view incoming and outgoing storage bytes per tenant (project).</para></listitem>
|
||||||
<listitem><para><guilabel>Global Network Usage</guilabel> tab to view duration and creation requests for
|
<listitem><para><guilabel>Global Network Usage</guilabel> tab to view duration and creation requests for
|
||||||
networks, subnets, routers, ports, and floating IPs, per tenant
|
networks, subnets, routers, ports, and floating IPs, per tenant
|
||||||
(project).</para></listitem>
|
(project).</para></listitem>
|
||||||
<listitem><para><guilabel>Stats</guilabel> tab to view a multi-series line chart with user-defined metrics.
|
<listitem><para><guilabel>Stats</guilabel> tab to view a multi-series line chart with user-defined metrics.
|
||||||
You group by project, define the value type (min, max, avg, or sum),
|
You group by project, define the value type (min, max, avg, or sum),
|
||||||
|
@@ -228,7 +228,7 @@ openstack/latest/user_data</computeroutput></screen>
|
|||||||
<programlisting language="ini">config_drive_format=iso9660</programlisting>
|
<programlisting language="ini">config_drive_format=iso9660</programlisting>
|
||||||
<para>By default, you cannot attach the configuration drive image as
|
<para>By default, you cannot attach the configuration drive image as
|
||||||
a CD drive instead of as a disk drive. To attach a CD drive, add
|
a CD drive instead of as a disk drive. To attach a CD drive, add
|
||||||
the following line to the
|
the following line to the
|
||||||
<filename>/etc/nova/nova.conf</filename> file:</para>
|
<filename>/etc/nova/nova.conf</filename> file:</para>
|
||||||
<programlisting language="ini">config_drive_cdrom=true</programlisting>
|
<programlisting language="ini">config_drive_cdrom=true</programlisting>
|
||||||
<para>For legacy reasons, you can configure the
|
<para>For legacy reasons, you can configure the
|
||||||
|
Reference in New Issue
Block a user