openstack/openstack-manuals
Code Issues Proposed changes

Merge "Small edits and a couple of tag fixes."

Browse Source
This commit is contained in:
Jenkins 2014-01-10 13:54:06 +00:00 committed by Gerrit Code Review
commit 923a20a27d
8 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
doc/common/section_cli_keystone_services.xml
View File

@ -56,20 +56,12 @@
+----------------------------------+----------+----------+---------------------------+</computeroutput></screen>
</step>
<step>
<para>To create a service, you use the following
command syntax:</para>
<screen><prompt>$</prompt> <userinput>keystone help service-create</userinput></screen>
<screen><computeroutput>usage: keystone service-create --name &lt;name> --type &lt;type>
[--description &lt;service-description>]
Add service to Service Catalog.
Arguments:
--name &lt;name> Name of new service (must be unique)
--type &lt;type> Service type (one of: identity, compute, network,
image, or object-store)
--description &lt;service-description>
Description of service</computeroutput></screen>
<para>To create a service, use the following command:</para>
<screen><prompt>$</prompt> <userinput>keystone service-create --name <replaceable>service_name</replaceable> --type <replaceable>service_type</replaceable> --description <replaceable>service_description</replaceable></userinput></screen>
<screen>Where:
-<replaceable>service_name</replaceable> = Name of new service (must be unique)
-<replaceable>service_type</replaceable> = Service type (one of: identity, compute, network, image, or object-store)
-<replaceable>service_description</replaceable> = Description of service</screen>
<para>For example, to create a service named
<literal>swift</literal> of type
<literal>object-store</literal>, run the
@ -85,7 +77,9 @@ Arguments:
+-------------+----------------------------------+</computeroutput></screen>
</step>
<step>
<para>To get details for a specified service:</para>
<para>To get details for a specific service, run the following:</para>
<screen><prompt>$</prompt> <userinput>keystone service-get <replaceable>service_ID</replaceable></userinput></screen>
<para>For example:</para>
<screen><prompt>$</prompt> <userinput>keystone service-get 84c23f4b942c44c38b9c42c5e517cd9a</userinput></screen>
<screen><computeroutput>+-------------+----------------------------------+
| Property | Value |

10
doc/common/section_cli_nova_quotas.xml
View File

@ -218,7 +218,7 @@
</procedure>
<procedure>
<title>To view quota values for an existing tenant (project)</title>
<step><para>Place the tenant ID in a useable variable, as follows:</para>
<step><para>Place the tenant ID in a usable variable, as follows:</para>
<screen><prompt>$</prompt> <userinput>tenant=$(keystone tenant-list | awk '/<replaceable>tenantName</replaceable>/ {print $2}')</userinput></screen>
</step>
<step>
@ -285,11 +285,11 @@
<title>View and update Compute quotas for a tenant user</title>
<procedure>
<title>To view quota values for a tenant user</title>
<step><para>Place the user ID in a useable variable, as follows:</para>
<step><para>Place the user ID in a usable variable, as follows:</para>
<screen><prompt>$</prompt> <userinput>tenantUser=$(keystone user-list | awk '/<replaceable>userName</replaceable>/ {print $2}')</userinput></screen>
</step>
<step>
<para>Place the user's tenant ID in a useable variable, as follows:</para>
<para>Place the user's tenant ID in a usable variable, as follows:</para>
<screen><prompt>$</prompt> <userinput>tenant=$(keystone tenant-list | awk '/<replaceable>tenantName</replaceable>/ {print $2}')</userinput></screen>
</step>
<step>
@ -319,10 +319,10 @@
</procedure>
<procedure>
<title>To update quota values for a tenant user</title>
<step><para>Place the user ID in a useable variable, as follows:</para>
<step><para>Place the user ID in a usable variable, as follows:</para>
<screen><prompt>$</prompt> <userinput>tenantUser=$(keystone user-list | awk '/<replaceable>userName</replaceable>/ {print $2}')</userinput></screen>
</step>
<step><para>Place the user's tenant ID in a useable variable, as follows:</para>
<step><para>Place the user's tenant ID in a usable variable, as follows:</para>
<screen><prompt>$</prompt> <userinput>tenant=$(keystone tenant-list | awk '/<replaceable>userName</replaceable>/ {print $2}')</userinput></screen>
</step>
<step>

18
doc/common/section_dashboard_access.xml
View File

@ -39,7 +39,7 @@
<step>
<para>In the address bar, type the host name or IP address
for the dashboard:</para>
<screen><prompt>$</prompt> <userinput>https://<replaceable>IP_ADDRESS_OR_HOSTNAME</replaceable>/</userinput></screen>
<screen><userinput>https://<replaceable>IP_ADDRESS_OR_HOSTNAME</replaceable>/</userinput></screen>
<note>
<title>Certificate warning</title>
<para>If a certificate warning appears when you try to
@ -78,14 +78,15 @@
view and manage resources in that project.</para>
<para>The <guilabel>Project</guilabel> tab displays the
details of the selected project.</para>
<informalfigure xml:id="dashboard_project_user">
<figure xml:id="dashboard_project_user">
<title>Dashboard Projects</title>
<mediaobject>
<imageobject>
<imagedata fileref="figures/dashboard-project-tab.png"
format="PNG" contentwidth="6in" width="6in"/>
</imageobject>
</mediaobject>
</informalfigure>
</figure>
<para>Access the following tabs:</para>
<para><guilabel>Manage Compute</guilabel> tab</para>
<variablelist>
@ -125,7 +126,7 @@
<term><guilabel>Access &amp;
Security</guilabel></term>
<listitem>
<para>Use these tabs to complete these
<para>Use the following tabs to complete these
tasks:</para>
<formalpara>
<title><guilabel>Security Groups</guilabel>
@ -199,7 +200,8 @@
<para>Enables administrative users to view usage and manage
instances, volumes, flavors, images, projects, users,
services, and quotas.</para>
<informalfigure xml:id="dashboard_admin_project_tab">
<figure xml:id="dashboard_admin_project_tab">
<title>Admin Tab</title>
<mediaobject>
<imageobject>
<imagedata
@ -207,7 +209,7 @@
format="PNG" contentwidth="6in" width="6in"/>
</imageobject>
</mediaobject>
</informalfigure>
</figure>
<para>Access the following categories to complete these tasks:</para>
<variablelist>
<varlistentry>
@ -219,7 +221,7 @@
<varlistentry>
<term><guilabel>Resource Usage</guilabel></term>
<listitem>
<para>Use these tabs to view the following usages:</para>
<para>Use the following tabs to view the following usages:</para>
<formalpara>
<title><guilabel>Global Disk Usage</guilabel>
tab</title>
@ -316,7 +318,7 @@
<varlistentry>
<term><guilabel>System Info</guilabel></term>
<listitem>
<para>Use these tabs to view the service info:</para>
<para>Use the following tabs to view the service info:</para>
<formalpara>
<title><guilabel>Services</guilabel> tab</title>
<para>View a list of the services.</para>

4
doc/user-guide-admin/section_cli_cinder_quotas.xml
View File

@ -14,8 +14,8 @@
<col width="80%"/>
<thead>
<tr>
<td>Property name</td>
<td>Defines the number of</td>
<th>Property name</th>
<th>Defines the number of</th>
</tr>
</thead>
<tbody>

6
doc/user-guide-admin/section_cli_nova_manage_projects_security.xml
View File

@ -172,7 +172,7 @@ export OS_TENANT_NAME=tenant01</programlisting>
<para>Delete the new security group, as follows:</para>
<screen><prompt>$</prompt> <userinput>nova secgroup-delete <replaceable>GroupName</replaceable></userinput></screen>
<para>For example:</para>
<screen><prompt>$</prompt> <userinput>nova secgroup-create global_http</userinput></screen>
<screen><prompt>$</prompt> <userinput>nova secgroup-delete global_http</userinput></screen>
</step>
</procedure>
<procedure>
@ -193,10 +193,10 @@ export OS_TENANT_NAME=tenant01</programlisting>
<para>Add a source group, as follows:</para>
<screen><prompt>$</prompt> <userinput>nova secgroup-add-group-rule <replaceable>secGroupName source-group ip-protocol from-port to-port</replaceable></userinput></screen>
<para>For example:</para>
<screen><prompt>$</prompt> <userinput>nova secgroup-add-group-rule cluster global-http tcp 22 22</userinput></screen>
<screen><prompt>$</prompt> <userinput>nova secgroup-add-group-rule cluster global_http tcp 22 22</userinput></screen>
<para>The <code>cluster</code> rule allows ssh access from
any other instance that uses the
<code>global-http</code> group.</para>
<code>global_http</code> group.</para>
</step>
</procedure>
</section>

4
doc/user-guide-admin/section_dashboard_admin_manage_instances.xml
View File

@ -85,9 +85,9 @@
<para>Depending on the current state of the instance,
you can choose to pause, un-pause, suspend,
resume, soft or hard reboot, or terminate an
instance.</para>
instance (items in red are disabled).</para>
<figure>
<title>Dashboard&mdash;Actions</title>
<title>Dashboard&mdash;Instance Actions</title>
<mediaobject>
<imageobject>
<imagedata

13
doc/user-guide-admin/section_dashboard_admin_manage_projects_users.xml
View File

@ -166,14 +166,17 @@
project, </para>
</listitem>
</itemizedlist>
<mediaobject>
<imageobject>
<imagedata
<figure xml:id="cloud_dash_users_list">
<title>Edit the Users List</title>
<mediaobject>
<imageobject>
<imagedata
fileref="figures/cloud_dash_users_list.png"
format="PNG" contentwidth="6in" width="6in"
/>
</imageobject>
</mediaobject>
</imageobject>
</mediaobject>
</figure>
</step>
<step>
<para>To assign a user to the current project, click

6
doc/user-guide-admin/section_dashboard_admin_manage_volumes.xml
View File

@ -21,9 +21,9 @@
xlink:href="http://docs.openstack.org/user-guide/content/"
><citetitle>OpenStack End User
Guide</citetitle></link>.</para>
<para>As an administrative user, you can manage volumes and volume
types for users in various projects. You can create and delete
volumes types, and you can view and delete volumes.</para>
<para>As an administrative user, you can manage volumes and volume types for users in various
projects. You can create and delete volume types, and you can view and delete
volumes.</para>
<section xml:id="dashboard_create_volume_types">
<title>Create a volume type</title>
<procedure>