From 58a889357e17976371b12673034873019a854b92 Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@b1-systems.de>
Date: Mon, 5 May 2014 14:38:33 +0200
Subject: [PATCH] corrected intents of screen environments
Also merged several screen environments in the Hyper-V chapter.
Change-Id: Ib81eafbf1429c881260958548676b884b4a15cca
---
.../compute/section_compute-system-admin.xml | 6 +-
.../section_cli_nova_host_aggregates.xml | 3 +-
doc/common/section_cli_nova_volumes.xml | 6 +-
.../section_keystone_certificates-for-pki.xml | 3 +-
.../section_objectstorage-ringbuilder.xml | 3 +-
.../drivers/emc-volume-driver.xml | 6 +-
.../drivers/nexenta-volume-driver.xml | 3 +-
.../compute/section_hypervisor_hyper-v.xml | 55 +++++--------------
.../object-storage/section_configure_s3.xml | 3 +-
doc/install-guide/section_cinder-node.xml | 3 +-
...r-tenant-routers-with-private-networks.xml | 3 +-
...i_keystone_manage_projects_users_roles.xml | 3 +-
doc/user-guide/section_sdk_manage_images.xml | 3 +-
13 files changed, 28 insertions(+), 72 deletions(-)
diff --git a/doc/admin-guide-cloud/compute/section_compute-system-admin.xml b/doc/admin-guide-cloud/compute/section_compute-system-admin.xml
index 5a2029902f..3f8fe97a15 100644
--- a/doc/admin-guide-cloud/compute/section_compute-system-admin.xml
+++ b/doc/admin-guide-cloud/compute/section_compute-system-admin.xml
@@ -408,8 +408,7 @@ local0.error @@172.20.1.43:1024</programlisting>
| nova-compute | HostB | nova | enabled | up | 2014-03-25T10:33:31.000000 | - |
| nova-compute | HostC | nova | enabled | up | 2014-03-25T10:33:31.000000 | - |
| nova-cert | HostA | internal | enabled | up | 2014-03-25T10:33:31.000000 | - |
-+------------------+-----------------------+----------+---------+-------+----------------------------+-----------------+</computeroutput>
- </screen>
++------------------+-----------------------+----------+---------+-------+----------------------------+-----------------+</computeroutput></screen>
<para>In this example, HostC can be picked up
because <systemitem class="service">nova-compute</systemitem>
is running on it.</para>
@@ -426,8 +425,7 @@ local0.error @@172.20.1.43:1024</programlisting>
| HostC | (used_max) | 13 | 21284 | 442 |
| HostC | p1 | 13 | 21284 | 442 |
| HostC | p2 | 13 | 21284 | 442 |
-+-----------+------------+-----+-----------+---------+</computeroutput>
- </screen>
++-----------+------------+-----+-----------+---------+</computeroutput></screen>
<itemizedlist>
<listitem>
<para><emphasis role="bold"
diff --git a/doc/common/section_cli_nova_host_aggregates.xml b/doc/common/section_cli_nova_host_aggregates.xml
index 87554e5ff8..5134ddc962 100644
--- a/doc/common/section_cli_nova_host_aggregates.xml
+++ b/doc/common/section_cli_nova_host_aggregates.xml
@@ -200,8 +200,7 @@
| Id | Name | Availability Zone | Hosts | Metadata |
+----+---------+-------------------+----------------------+-------------------+
| 1 | fast-io | nova | [u'node1', u'node2'] | {u'ssd': u'true'} |
-+----+---------+-------------------+----------------------+-------------------+</computeroutput>
-</screen>
++----+---------+-------------------+----------------------+-------------------+</computeroutput></screen>
<para>Use the <command>nova flavor-create</command> command to
create the <literal>ssd.large</literal> flavor called with
an ID of 6, 8 GB of RAM, 80 GB root disk, and 4
diff --git a/doc/common/section_cli_nova_volumes.xml b/doc/common/section_cli_nova_volumes.xml
index b695fa1c40..30b1923fa8 100644
--- a/doc/common/section_cli_nova_volumes.xml
+++ b/doc/common/section_cli_nova_volumes.xml
@@ -9,8 +9,7 @@
<para>Depending on the setup of your cloud provider, they may give you an endpoint to use to
manage volumes, or there may be an extension under the covers. In either case, you can use the
<command>nova</command> CLI to manage volumes:</para>
- <screen>
- volume-attach Attach a volume to a server.
+ <screen>volume-attach Attach a volume to a server.
volume-create Add a new volume.
volume-delete Remove a volume.
volume-detach Detach a volume from a server.
@@ -23,8 +22,7 @@
volume-type-create Create a new volume type.
volume-type-delete Delete a specific flavor
volume-type-list Print a list of available 'volume types'.
- volume-update Update an attached volume.
- </screen>
+ volume-update Update an attached volume.</screen>
<para>For example, to list IDs and names of Compute volumes, run:</para>
<screen><prompt>$</prompt> <userinput>nova volume-list</userinput>
<computeroutput>+--------------------------------------+-----------+--------------+------+-------------+-------------+
diff --git a/doc/common/section_keystone_certificates-for-pki.xml b/doc/common/section_keystone_certificates-for-pki.xml
index 77b30f08aa..b83e1d0428 100644
--- a/doc/common/section_keystone_certificates-for-pki.xml
+++ b/doc/common/section_keystone_certificates-for-pki.xml
@@ -216,8 +216,7 @@ emailAddress = keystone@openstack.org
<prompt>#</prompt> <userinput>cp signing_cert.pem /etc/keystone/ssl/certs/</userinput>
<prompt>#</prompt> <userinput>cp signing_key.pem /etc/keystone/ssl/certs/</userinput>
<prompt>#</prompt> <userinput>cp cacert.pem /etc/keystone/ssl/certs/</userinput>
-<prompt>#</prompt> <userinput>chmod -R 700 /etc/keystone/ssl/certs</userinput>
-</screen>
+<prompt>#</prompt> <userinput>chmod -R 700 /etc/keystone/ssl/certs</userinput></screen>
<note>
<para>Make sure the certificate directory is only
accessible by root.</para>
diff --git a/doc/common/section_objectstorage-ringbuilder.xml b/doc/common/section_objectstorage-ringbuilder.xml
index dbfb2d035c..967817633e 100644
--- a/doc/common/section_objectstorage-ringbuilder.xml
+++ b/doc/common/section_objectstorage-ringbuilder.xml
@@ -87,8 +87,7 @@ part2dev_id in self._replica2part2dev_id]</programlisting></para>
<prompt>$</prompt> <userinput>swift-ring-builder object.builder set_replicas 3.02</userinput>
<prompt>$</prompt> <userinput>swift-ring-builder object.builder rebalance</userinput>
-<computeroutput><creatdistribute rings and wait>...</computeroutput>
- </screen>
+<computeroutput><creatdistribute rings and wait>...</computeroutput></screen>
<para>Changes take effect after the ring is rebalanced.
Therefore, if you intend to change from 3 replicas to 3.01
but you accidentally type <literal>2.01</literal>, no data
diff --git a/doc/config-reference/block-storage/drivers/emc-volume-driver.xml b/doc/config-reference/block-storage/drivers/emc-volume-driver.xml
index 42b7c3b510..2a36c70795 100644
--- a/doc/config-reference/block-storage/drivers/emc-volume-driver.xml
+++ b/doc/config-reference/block-storage/drivers/emc-volume-driver.xml
@@ -306,16 +306,14 @@ cinder_emc_config_file = /etc/cinder/cinder_emc_config.xml</programlisting>
<step>
<para>Create the volume types:</para>
<screen><prompt>$</prompt> <userinput>cinder type-create "High Performance"</userinput>
-<prompt>$</prompt> <userinput>cinder type-create "Standard Performance"</userinput>
- </screen>
+<prompt>$</prompt> <userinput>cinder type-create "Standard Performance"</userinput></screen>
</step>
<step>
<para>Setup the volume type extra specs:</para>
<screen><prompt>$</prompt> <userinput>cinder type-key "High Performance" set storagetype:pool=smi_pool</userinput>
<prompt>$</prompt> <userinput>cinder type-key "High Performance" set storagetype:provisioning=thick</userinput>
<prompt>$</prompt> <userinput>cinder type-key "Standard Performance" set storagetype:pool=smi_pool2</userinput>
-<prompt>$</prompt> <userinput>cinder type-key "Standard Performance" set storagetype:provisioning=thin</userinput>
- </screen>
+<prompt>$</prompt> <userinput>cinder type-key "Standard Performance" set storagetype:provisioning=thin</userinput></screen>
</step>
</procedure>
<para>In the above example, two volume types are created.
diff --git a/doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml b/doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml
index ab7429a6ea..d7b2ed3a98 100644
--- a/doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml
+++ b/doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml
@@ -91,8 +91,7 @@ volume_driver = cinder.volume.drivers.nexenta.nfs.NexentaNfsDriver
option. For example, if the value of this option was
set to <filename>/etc/cinder/nfs_shares</filename>,
then:</para>
- <screen>
-<prompt>#</prompt> <userinput>cat /etc/cinder/nfs_shares</userinput>
+ <screen><prompt>#</prompt> <userinput>cat /etc/cinder/nfs_shares</userinput>
<computeroutput>192.168.1.200:/storage http://admin:nexenta@192.168.1.200:2000
192.168.1.201:/storage http://admin:nexenta@192.168.1.201:2000
192.168.1.202:/storage http://admin:nexenta@192.168.1.202:2000</computeroutput></screen>
diff --git a/doc/config-reference/compute/section_hypervisor_hyper-v.xml b/doc/config-reference/compute/section_hypervisor_hyper-v.xml
index d75eab6075..923b84b8e1 100644
--- a/doc/config-reference/compute/section_hypervisor_hyper-v.xml
+++ b/doc/config-reference/compute/section_hypervisor_hyper-v.xml
@@ -38,15 +38,9 @@
<para>Network time services must be configured to ensure proper operation of the Hyper-V
compute node. To set network time on your Hyper-V host you must run the
following commands:</para>
- <screen>
-<prompt>C:\</prompt><userinput>net stop w32time</userinput>
- </screen>
- <screen>
+ <screen><prompt>C:\</prompt><userinput>net stop w32time</userinput>
<prompt>C:\</prompt><userinput>w32tm /config /manualpeerlist:pool.ntp.org,0x8 /syncfromflags:MANUAL</userinput>
- </screen>
- <screen>
-<prompt>C:\</prompt><userinput>net start w32time</userinput>
- </screen>
+<prompt>C:\</prompt><userinput>net start w32time</userinput></screen>
</section>
<section xml:id="hyper-v-virtual-switch">
<title>Configure Hyper-V virtual switching</title>
@@ -56,24 +50,16 @@
</para>
<para>To quickly enable an interface to be used as a Virtual Interface the following
PowerShell may be used:</para>
- <screen>
-<prompt>PS C:\</prompt><userinput>$if = Get-NetIPAddress –IPAddress 192* | Get-NetIPInterface</userinput>
- </screen>
- <screen>
-<prompt>PS C:\</prompt><userinput>New-VMSwitch -NetAdapterName $if.ifAlias -Name yourbridgename –AllowManagementOS $false</userinput>
-</screen>
+ <screen><prompt>PS C:\</prompt><userinput>$if = Get-NetIPAddress –IPAddress 192* | Get-NetIPInterface</userinput>
+<prompt>PS C:\</prompt><userinput>New-VMSwitch -NetAdapterName $if.ifAlias -Name yourbridgename –AllowManagementOS $false</userinput></screen>
</section>
<section xml:id="enable-iscsi-services-hyper-v">
<title>Enable iSCSI initiator service</title>
<para>To prepare the Hyper-V node to be able to attach to volumes provided by cinder
you must first make sure the Windows iSCSI initiator service is running and
started automatically.</para>
- <screen>
-<prompt>C:\</prompt><userinput>sc start MSiSCSI</userinput>
- </screen>
- <screen>
-<prompt>C:\</prompt><userinput>sc config MSiSCSI start="auto"</userinput>
- </screen>
+ <screen><prompt>C:\</prompt><userinput>sc start MSiSCSI</userinput>
+<prompt>C:\</prompt><userinput>sc config MSiSCSI start="auto"</userinput></screen>
</section>
<section xml:id="live-migration-hyper-v">
<title>Configure shared nothing live migration</title>
@@ -143,22 +129,15 @@
deployed with the setup must run with domain
credentials. You can set the service credentials
with:</para>
- <screen>
-<prompt>C:\</prompt><userinput>sc config openstack-compute obj="DOMAIN\username" password="password"</userinput></screen>
+ <screen><prompt>C:\</prompt><userinput>sc config openstack-compute obj="DOMAIN\username" password="password"</userinput></screen>
</listitem>
</itemizedlist>
<para><emphasis role="bold">How to setup live migration on Hyper-V</emphasis></para>
<para>To enable 'shared nothing live' migration, run the 3 PowerShell instructions below on
each Hyper-V host:</para>
- <screen>
-<prompt>PS C:\</prompt><userinput>Enable-VMMigration</userinput>
- </screen>
- <screen>
+ <screen><prompt>PS C:\</prompt><userinput>Enable-VMMigration</userinput>
<prompt>PS C:\</prompt><userinput>Set-VMMigrationNetwork <replaceable>IP_ADDRESS</replaceable></userinput>
- </screen>
- <screen>
-<prompt>PS C:\</prompt><userinput>Set-VMHost –VirtualMachineMigrationAuthenticationTypeKerberos</userinput>
- </screen>
+<prompt>PS C:\</prompt><userinput>Set-VMHost –VirtualMachineMigrationAuthenticationTypeKerberos</userinput></screen>
<note>
<para>Please replace the IP_ADDRESS with the address of the interface which will provide
the virtual switching for nova-network.</para>
@@ -232,9 +211,7 @@
</itemizedlist>
<para>You must install the following Python packages through <command>easy_install</command> or <command>pip</command>. Run the
following replacing PACKAGENAME with the following packages:</para>
- <screen>
-<prompt>C:\</prompt><userinput>c:\Python27\Scripts\pip.exe install <replaceable>PACKAGE_NAME</replaceable></userinput>
- </screen>
+ <screen><prompt>C:\</prompt><userinput>c:\Python27\Scripts\pip.exe install <replaceable>PACKAGE_NAME</replaceable></userinput></screen>
<itemizedlist>
<listitem>
<para>amqplib</para>
@@ -318,9 +295,7 @@
installer and follow the prompts in the installation wizard. The default should be
acceptable for the needs of the document.</para>
<para>Once installed you may run the following to clone the Nova code.</para>
- <screen>
-<prompt>C:\</prompt><userinput>git.exe clone https://github.com/openstack/nova.git</userinput>
- </screen>
+ <screen><prompt>C:\</prompt><userinput>git.exe clone https://github.com/openstack/nova.git</userinput></screen>
</section>
<section xml:id="sample_nova-conf-hyper-v">
<title>Configure Nova.conf</title>
@@ -360,17 +335,13 @@ connection=mysql://nova:passwd@<replaceable>IP_ADDRESS</replaceable>/nova</progr
>http://technet.microsoft.com/en-us/library/cc772480.aspx</link></para>
<para>Once you have successfully created a virtual machine, you can then upload the image to
glance using the native glance-client:</para>
- <screen>
-<prompt>C:\</prompt><userinput>glance image-create --name="<replaceable>VM_IMAGE_NAME</replaceable>" --is-public=true --container-format=bare --disk-format=vhd</userinput>
- </screen>
+ <screen><prompt>C:\</prompt><userinput>glance image-create --name="<replaceable>VM_IMAGE_NAME</replaceable>" --is-public=true --container-format=bare --disk-format=vhd</userinput></screen>
</section>
<section xml:id="running_compute-with-hyper-v">
<title>Run Compute with Hyper-V</title>
<para>To start the <systemitem class="service">nova-compute</systemitem> service, run this command from a console in the Windows
server:</para>
- <screen>
-<prompt>C:\</prompt><userinput>C:\python27\python.exe c:\openstack\nova\bin\nova-compute.py</userinput>
- </screen>
+ <screen><prompt>C:\</prompt><userinput>C:\python27\python.exe c:\openstack\nova\bin\nova-compute.py</userinput></screen>
</section>
<section xml:id="troubleshooting-hyper-v">
<title>Troubleshoot Hyper-V configuration</title>
diff --git a/doc/config-reference/object-storage/section_configure_s3.xml b/doc/config-reference/object-storage/section_configure_s3.xml
index 26f67c1d32..aaabb3e7d4 100644
--- a/doc/config-reference/object-storage/section_configure_s3.xml
+++ b/doc/config-reference/object-storage/section_configure_s3.xml
@@ -64,8 +64,7 @@ use = egg:swift3#swift3</programlisting>
<literallayout class="monospaced">my @endpoints = ( '1.2.3.4');</literallayout>
<para>Now you can send commands to the endpoint, such
as:</para>
- <screen><prompt>$</prompt> <userinput>./s3curl.pl - 'a7811544507ebaf6c9a7a8804f47ea1c' -key 'a7d8e981-e296-d2ba-cb3b-db7dd23159bd' -get - -s -v http://1.2.3.4:8080</userinput>
- </screen>
+ <screen><prompt>$</prompt> <userinput>./s3curl.pl - 'a7811544507ebaf6c9a7a8804f47ea1c' -key 'a7d8e981-e296-d2ba-cb3b-db7dd23159bd' -get - -s -v http://1.2.3.4:8080</userinput></screen>
<para>To set up your client, ensure you are using the ec2 credentials,
which can be downloaded from the <guilabel>API Endpoints</guilabel> tab
of the dashboard.
diff --git a/doc/install-guide/section_cinder-node.xml b/doc/install-guide/section_cinder-node.xml
index af776a38fa..6757c92b22 100644
--- a/doc/install-guide/section_cinder-node.xml
+++ b/doc/install-guide/section_cinder-node.xml
@@ -220,8 +220,7 @@ glance_host = <replaceable>controller</replaceable></programlisting>
<step os="rhel;fedora;centos;opensuse;sles">
<para>Start and configure the Block Storage services to start
when the system boots:</para>
- <screen>
-<prompt>#</prompt> <userinput>service openstack-cinder-volume start</userinput>
+ <screen><prompt>#</prompt> <userinput>service openstack-cinder-volume start</userinput>
<prompt>#</prompt> <userinput>service tgtd start</userinput>
<prompt>#</prompt> <userinput>chkconfig openstack-cinder-volume on</userinput>
<prompt>#</prompt> <userinput>chkconfig tgtd on</userinput></screen>
diff --git a/doc/install-guide/section_neutron-per-tenant-routers-with-private-networks.xml b/doc/install-guide/section_neutron-per-tenant-routers-with-private-networks.xml
index 9e477630b3..aa88598975 100644
--- a/doc/install-guide/section_neutron-per-tenant-routers-with-private-networks.xml
+++ b/doc/install-guide/section_neutron-per-tenant-routers-with-private-networks.xml
@@ -716,8 +716,7 @@ rtt min/avg/max/mdev = 0.898/15.621/45.027/20.793 ms
--os-auth-url=http://localhost:5000/v2.0 net-create TenantC-Net2</userinput>
<prompt>$</prompt> <userinput>neutron --os-tenant-name TenantC --os-username UserC --os-password password \
--os-auth-url=http://localhost:5000/v2.0 subnet-create TenantC-Net2 \
- 10.0.1.0/24 --name TenantC-Subnet2</userinput>
-</screen>
+ 10.0.1.0/24 --name TenantC-Subnet2</userinput></screen>
<para>After that you can use admin user to
query the network's provider network
information:</para>
diff --git a/doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml b/doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml
index 5f9ea4fa07..366011e50b 100644
--- a/doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml
+++ b/doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml
@@ -53,8 +53,7 @@
<screen><prompt>$</prompt> <userinput>keystone service create \
--name=nova \
--type=compute \
---description="Nova Compute Service"</userinput>
-</screen>
+--description="Nova Compute Service"</userinput></screen>
</section>
<section xml:id="keystone-service-list">
<title><literal>service-list</literal></title>
diff --git a/doc/user-guide/section_sdk_manage_images.xml b/doc/user-guide/section_sdk_manage_images.xml
index f2acedb85a..479118a914 100644
--- a/doc/user-guide/section_sdk_manage_images.xml
+++ b/doc/user-guide/section_sdk_manage_images.xml
@@ -18,8 +18,7 @@ images = glance.images.list()</programlisting>
<para>The <methodname>images</methodname> method returns a Python
generator, as shown in the following interaction with the Python
interpreter:</para>
- <screen>
-<prompt>>>></prompt> <userinput>images = glance.images.list()</userinput>
+ <screen><prompt>>>></prompt> <userinput>images = glance.images.list()</userinput>
<prompt>>>></prompt> <userinput>images</userinput>
<computeroutput><generator object list at 0x105e9c2d0></computeroutput>
<prompt>>>></prompt> <userinput>list(images)</userinput>