From 1986be336461acf49c4e6171bfe85a8935316f71 Mon Sep 17 00:00:00 2001 From: zhangguoqing Date: Thu, 14 Apr 2016 16:52:41 +0800 Subject: [PATCH] Delete the presence of default flavors There are not any default flavors after the commit "Remove flavor seeding from the base migration" which removes default flavors from the database, that means the new deploys will not have them(m1.tiny, m1.small, m1.medium, m1.large, m1.xlarge). Change-Id: Ifcdd6f1500a937de8dfd9d265bd5ee3406cb70e0 Closes-Bug: #1567009 --- doc/admin-guide/source/compute-arch.rst | 7 +++---- .../source/compute-images-instances.rst | 5 +++-- doc/user-guide/source/cli-cheat-sheet.rst | 6 ++++++ doc/user-guide/source/cli-launch-instances.rst | 6 ++++++ doc/user-guide/source/create-db.rst | 18 ++---------------- 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/doc/admin-guide/source/compute-arch.rst b/doc/admin-guide/source/compute-arch.rst index 03c4d8101c..86b0d86014 100644 --- a/doc/admin-guide/source/compute-arch.rst +++ b/doc/admin-guide/source/compute-arch.rst @@ -279,10 +279,9 @@ The displayed image attributes are: is the UUID of the instance the snapshot derives from. For uploaded images, this field is blank. -Virtual hardware templates are called ``flavors``. The default -installation provides five flavors. By default, these are configurable -by admin users, however that behavior can be changed by redefining the -access controls for ``compute_extension:flavormanage`` in +Virtual hardware templates are called ``flavors``. By default, these are +configurable by admin users, however that behavior can be changed by +redefining the access controls for ``compute_extension:flavormanage`` in ``/etc/nova/policy.json`` on the ``compute-api`` server. For a list of flavors that are available on your system: diff --git a/doc/admin-guide/source/compute-images-instances.rst b/doc/admin-guide/source/compute-images-instances.rst index df48d864bb..0203cb3f76 100644 --- a/doc/admin-guide/source/compute-images-instances.rst +++ b/doc/admin-guide/source/compute-images-instances.rst @@ -364,8 +364,9 @@ The displayed image attributes are: is the UUID of the instance the snapshot derives from. For uploaded images, this field is blank. -Virtual hardware templates are called ``flavors``. The default -installation provides five predefined flavors. +Virtual hardware templates are called ``flavors``, and are defined by +administrators. Prior to the Newton release, a default installation also +includes five predefined flavors. For a list of flavors that are available on your system, run: diff --git a/doc/user-guide/source/cli-cheat-sheet.rst b/doc/user-guide/source/cli-cheat-sheet.rst index 023b6b512d..85708c2981 100644 --- a/doc/user-guide/source/cli-cheat-sheet.rst +++ b/doc/user-guide/source/cli-cheat-sheet.rst @@ -94,6 +94,12 @@ List images $ openstack image list +Create a flavor named m1.tiny + +.. code-block:: console + + $ openstack flavor create --ram 512 --disk 1 --vcpus 1 m1.tiny + List flavors .. code-block:: console diff --git a/doc/user-guide/source/cli-launch-instances.rst b/doc/user-guide/source/cli-launch-instances.rst index 994b4a27df..f7feb598eb 100644 --- a/doc/user-guide/source/cli-launch-instances.rst +++ b/doc/user-guide/source/cli-launch-instances.rst @@ -70,6 +70,12 @@ Gather parameters to launch an instance Before you begin, source the OpenStack RC file. +#. Create a flavor. + + .. code-block:: console + + $ openstack flavor create --ram 512 --disk 1 --vcpus 1 m1.tiny + #. List the available flavors. .. code-block:: console diff --git a/doc/user-guide/source/create-db.rst b/doc/user-guide/source/create-db.rst index 92d5d96bcd..30c6cd27ac 100644 --- a/doc/user-guide/source/create-db.rst +++ b/doc/user-guide/source/create-db.rst @@ -16,30 +16,16 @@ Create and access a database When you create a database instance, you must specify a nova flavor. The flavor indicates various characteristics of the instance, such as - RAM, root volume size, and so on. The default nova flavors are not - sufficient to create database instances. You might need to create or - obtain some new nova flavors that work for databases. + RAM and root volume size. You will need to create or + obtain new nova flavors that work for databases. The first step is to list flavors by using the :command:`openstack flavor list` command. - Here are the default flavors, although you may have additional custom - flavors in your environment: - .. code-block:: console $ openstack flavor list - +-----+-----------+-------+------+-----------+-------+-----------+ - | ID | Name | RAM | Disk | Ephemeral | VCPUs | Is_Public | - +-----+-----------+-------+------+-----------+-------+-----------+ - | 1 | m1.tiny | 512 | 1 | 0 | 1 | True | - | 2 | m1.small | 2048 | 20 | 0 | 1 | True | - | 3 | m1.medium | 4096 | 40 | 0 | 2 | True | - | 4 | m1.large | 8192 | 80 | 0 | 4 | True | - | 5 | m1.xlarge | 16384 | 160 | 0 | 8 | True | - +-----+-----------+-------+------+-----------+-------+-----------+ - Now take a look at the minimum requirements for various database instances: