diff --git a/doc/user-guide/section_dashboard_launch_instances.xml b/doc/user-guide/section_dashboard_launch_instances.xml index bae92feee7..8f96d62022 100644 --- a/doc/user-guide/section_dashboard_launch_instances.xml +++ b/doc/user-guide/section_dashboard_launch_instances.xml @@ -13,19 +13,15 @@ Launch and manage instances Instances are virtual machines that run inside the cloud. - You can launch an - instance from an OpenStack image. The OpenStack + You can launch + an instance from various sources. The OpenStack Image Service provides a pool of images that are accessible to members of different projects. - You can also launch an - instance from an image that you have copied to a - persistent volume. The instance boots from the - volume, which is provided by cinder-volume through iSCSI. When you launch - an instance from a volume, especially note the following - steps: + You can also launch an instance from an image that you have copied to + a persistent volume. The instance boots from the volume, which is provided + by cinder-volume through iSCSI. + When you launch an instance from a volume, especially note the following + steps: To select from which volume to boot, launch an @@ -47,9 +43,6 @@ - -
SSH in to your instance To SSH into your instance, you use the downloaded diff --git a/doc/user-guide/section_dashboard_launch_instances_from_image.xml b/doc/user-guide/section_dashboard_launch_instances_from_image.xml index 074da85898..b67e9d572f 100644 --- a/doc/user-guide/section_dashboard_launch_instances_from_image.xml +++ b/doc/user-guide/section_dashboard_launch_instances_from_image.xml @@ -9,7 +9,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="dashboard_launch_instances_from_image"> - Launch an instance from an image + Launch an instance When you launch an instance from an image, OpenStack creates a local copy of the image on the compute node where the @@ -22,6 +22,10 @@ The dashboard shows the images that have been uploaded to OpenStack Image Service and are available for this project. + For details on creating images, see + Creating images manually in the OpenStack Virtual + Machine Image Guide. Select an image and click @@ -30,10 +34,10 @@ In the Launch Instance window, specify the following values: - - - - + + + + Details tab @@ -41,15 +45,29 @@ - Instance - Source - Image or snapshot. + Availability Zone + + By default, this value is set to the availability + zone given by the cloud provider (for example, + us-west or apac-south). + Though, it could be nova for most cases. + + - Instance - Name - The name to assign to the virtual - machine. + Instance Name + The name to assign to the virtual machine. + + + The name you assign here becomes the initial host + name of the server. After the server is built, if you + change the server name in the API or change the host + name directly, the names are not updated in the dashboard. + Server names are not guaranteed to be unique when + created so you could have two instances with the same + host name. + + @@ -64,6 +82,76 @@ a value greater than 1. Default is 1. + + + + Instance Boot Source + + + Your options are: + + + + Boot from image - If you choose + this option, a new field for Image Name + displays. You can select the image from the + dropdown list. + + + + + Boot from snapshot - If you + choose this option, a new field for Instance Snapshot + displays. You can select the snapshot from + the dropdown list. + + + + + Boot from volume - If you + choose this option, a new field for Volume + displays. You can select the volume from the + dropdown list. + + + + + Boot from image (creates a new volume) + - With this option, you can boot from + an image and create a volume by entering the Device Size + and Device Name for your + volume. + + + + + Boot from volume snapshot (creates a new + volume) - Using this option, you can + boot from a volume snapshot and create a new + volume by choosing Volume Snapshot + from a dropdown list and adding a Device Name + for your volume. + + + + Since you are launching an instance from an image, + Boot from image is chosen by + default. + + + + + + Image Name + + + + This field changes based on your previous selection. + Since you have chosen to launch an instance using an image, + the Image Name field displays. + Select the image name from the dropdown list. + + Access & @@ -71,7 +159,7 @@ Keypair - A keypair. + Select a keypair from the dropdown list. In case an image uses a static root password or a static key set (neither is recommended), you do not need to @@ -81,7 +169,6 @@ Security Groups - Activate the security groups that you want to assign to the instance. @@ -98,24 +185,14 @@ Volume Options + >Networking tab - Volume - Options - Not applicable when you launch an - instance from an image.To - launch from a volume or volume - snapshot, select the appropriate - option in the Volume - Options drop-down list. - Then, choose the volume or - snapshot. - For information about how to create - a bootable volume, see . + Selected Networks + To add a network to the instance, click the + + in the Available + Networks field. Customization Script - A customization script that runs - after your instance - launches. + A customization script that runs after your + instance launches. diff --git a/doc/user-guide/section_dashboard_launch_instances_from_volume.xml b/doc/user-guide/section_dashboard_launch_instances_from_volume.xml deleted file mode 100644 index 46b0846b8c..0000000000 --- a/doc/user-guide/section_dashboard_launch_instances_from_volume.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - -]> -
- Launch an instance from a volume - - You can launch an instance directly from an image that has - been copied to a persistent volume. - - - Create a volume that is large enough to store an - unzipped image. - - - Create an image. - For details, see Creating images manually in the - OpenStack Virtual Machine Image - Guide. - - - Launch an instance. - - - Attach the volume to the instance. - - - Assuming that the attached volume is mounted as - /dev/vdb, use one of the - following commands to copy the image to the attached - volume: - - - For a raw image: - $ cat IMAGE >/dev/vdb - Alternatively, use - dd. - - - For a non-raw image: - $ qemu-img convert -O raw IMAGE /dev/vdb - - - For a *.tar.bz2 image: - $ tar xfjO IMAGE >/dev/vdb - - - - - Because only detached volumes are available for - booting, detach the volume. - - - Now, you can launch an instance from an image - that has been copied to the volume. The - instance is booted from the volume, which is provided - by cinder-volume through iSCSI. To launch - an instance from the volume, see . - - -
diff --git a/www/.htaccess b/www/.htaccess index 8360089a2e..cbb638db82 100644 --- a/www/.htaccess +++ b/www/.htaccess @@ -72,6 +72,9 @@ redirectmatch 301 /api/openstack-compute/programmer/content/.*$ /api/quick-start # Redirect CLI Guide to new End User Guide redirectmatch 301 /trunk/cli/quick-start/content/.*$ /user-guide/content/ +# Redirecting removed pages from the user guide +redirect 301 /user-guide/content/dashboard_launch_instances_from_volume.html /user-guide/content/dashboard_launch_instances_from_image.html + # Redirect docs.openstack.org index.html subpage pointers to main page redirect 301 /install/ / redirect 301 /basic-install/ /