diff --git a/doc/src/docbkx/basic-install/src/basic-install_compute-common.xml b/doc/src/docbkx/basic-install/src/basic-install_compute-common.xml
index 387e134856..df648e94e3 100644
--- a/doc/src/docbkx/basic-install/src/basic-install_compute-common.xml
+++ b/doc/src/docbkx/basic-install/src/basic-install_compute-common.xml
@@ -11,7 +11,7 @@
Time zone : UTC
- Hostname : folsom-compute
+ Hostname : grizzly-computePackages : OpenSSH-Server
@@ -20,10 +20,10 @@
After OS Installation, reboot the server .
- Since Ubuntu 12.04 LTS has OpenStack Essex by default, we are going to use
- Cloud Archives for Folsom :apt-get install ubuntu-cloud-keyringEdit
+ Since the default OpenStack version in Ubuntu 12.04 LTS is older, we are going to use
+ Cloud Archives for Grizzly :apt-get install ubuntu-cloud-keyringEdit
/etc/apt/sources.list.d/cloud-archive.list
- :deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/folsom main Upgrade
+ :deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/grizzly main Upgrade
the system (and reboot if you need)
:apt-get update && apt-get upgrade
@@ -64,9 +64,9 @@ net.ipv4.conf.default.rp_filter = 0
Edit the /etc/hosts file and
- add folsom-controller, folsom-network and folsom-compute hostnames with correct IP.
+ add grizzly-controller, grizzly-network and grizzly-compute hostnames with correct IP.
diff --git a/doc/src/docbkx/basic-install/src/basic-install_compute-nova.xml b/doc/src/docbkx/basic-install/src/basic-install_compute-nova.xml
index 983af93c77..217726bf48 100644
--- a/doc/src/docbkx/basic-install/src/basic-install_compute-nova.xml
+++ b/doc/src/docbkx/basic-install/src/basic-install_compute-nova.xml
@@ -51,7 +51,6 @@ ec2_url=http://192.168.0.1:8773/services/Cloud
keystone_ec2_url=http://192.168.0.1:5000/v2.0/ec2tokens
api_paste_config=/etc/nova/api-paste.ini
allow_admin_api=true
-use_deprecated_auth=false
ec2_private_dns_show_ip=True
dmz_cidr=169.254.169.254/32
ec2_dmz_host=192.168.0.1
diff --git a/doc/src/docbkx/basic-install/src/basic-install_controller-common.xml b/doc/src/docbkx/basic-install/src/basic-install_controller-common.xml
index 1e78a069cd..310b3f2ec5 100644
--- a/doc/src/docbkx/basic-install/src/basic-install_controller-common.xml
+++ b/doc/src/docbkx/basic-install/src/basic-install_controller-common.xml
@@ -22,13 +22,12 @@
After OS Installation, reboot the server.
- Since Ubuntu 12.04 LTS has OpenStack Essex
- by default, we are going to use the Ubuntu Cloud
- Archive for Folsom
+ Since the default OpenStack release in Ubuntu 12.04 LTS is older, we are going to use the Ubuntu Cloud
+ Archive for Grizzly
:apt-get install ubuntu-cloud-keyringEdit
/etc/apt/sources.list.d/cloud-archive.list
- :deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/folsom main Upgrade
+ :deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/grizzly main Upgrade
the system (and reboot if you need)
:apt-get update && apt-get upgrade
diff --git a/doc/src/docbkx/basic-install/src/basic-install_controller-glance.xml b/doc/src/docbkx/basic-install/src/basic-install_controller-glance.xml
index 60c75cb832..9d2a88b8fd 100644
--- a/doc/src/docbkx/basic-install/src/basic-install_controller-glance.xml
+++ b/doc/src/docbkx/basic-install/src/basic-install_controller-glance.xml
@@ -44,7 +44,7 @@ rabbit_password = password
+--------------------------------------+--------+-------------+------------------+-----------+--------+
- You can also install Glance Replicator (new in Folsom).
+ You can also install Glance Replicator.
More informations about it here.
diff --git a/doc/src/docbkx/basic-install/src/basic-install_controller-keystone.xml b/doc/src/docbkx/basic-install/src/basic-install_controller-keystone.xml
index ad58ddec0b..c0cf4dff16 100644
--- a/doc/src/docbkx/basic-install/src/basic-install_controller-keystone.xml
+++ b/doc/src/docbkx/basic-install/src/basic-install_controller-keystone.xml
@@ -65,14 +65,14 @@ echo "source novarc">>.bashrc
Download the data script and fill Keystone database
with data (users, tenants, services)
:./keystone-data.shDownload the endpoint script and create the endpoints (for projects) :./keystone-endpoints.sh
+ xlink:href="https://github.com/EmilienM/openstack-grizzly-guide/raw/master/scripts/keystone-endpoints.sh">endpoint script and create the endpoints (for projects) :./keystone-endpoints.sh
If an IP address of the management network on the controller node is different from this example, please use the following:./keystone-endpoints.sh -K <ip address of the management network>
diff --git a/doc/src/docbkx/basic-install/src/basic-install_controller-nova.xml b/doc/src/docbkx/basic-install/src/basic-install_controller-nova.xml
index 1d4833afc4..33f669277c 100644
--- a/doc/src/docbkx/basic-install/src/basic-install_controller-nova.xml
+++ b/doc/src/docbkx/basic-install/src/basic-install_controller-nova.xml
@@ -19,10 +19,7 @@
file and modify
:admin_tenant_name = service
admin_user = nova
-admin_password = passwordSince
- we are going to use Cinder for volumes, we should also delete each part concerning "nova-volume" :
+admin_password = password
============================================================
[composite:osapi_volume]
use = call:nova.api.openstack.urlmap:urlmap_factory
@@ -72,7 +69,6 @@ ec2_url=http://192.168.0.1:8773/services/Cloud
keystone_ec2_url=http://192.168.0.1:5000/v2.0/ec2tokens
api_paste_config=/etc/nova/api-paste.ini
allow_admin_api=true
-use_deprecated_auth=false
ec2_private_dns_show_ip=True
dmz_cidr=169.254.169.254/32
ec2_dmz_host=192.168.0.1
diff --git a/doc/src/docbkx/basic-install/src/basic-install_intro.xml b/doc/src/docbkx/basic-install/src/basic-install_intro.xml
index 1a17ed26b8..afd29c2c1f 100644
--- a/doc/src/docbkx/basic-install/src/basic-install_intro.xml
+++ b/doc/src/docbkx/basic-install/src/basic-install_intro.xml
@@ -5,7 +5,7 @@
xml:id="basic-install_intro">
IntroductionThis document helps anyone who wants to deploy OpenStack
- Folsom for development purposes with Ubuntu 12.04 LTS (using
+ Grizzly for development purposes with Ubuntu 12.04 LTS (using
the Ubuntu Cloud Archive).We are going to install a three-node setup with one
controller, one network and one compute node.
diff --git a/doc/src/docbkx/basic-install/src/basic-install_network-common.xml b/doc/src/docbkx/basic-install/src/basic-install_network-common.xml
index e23cbdfef9..d6acc55a96 100644
--- a/doc/src/docbkx/basic-install/src/basic-install_network-common.xml
+++ b/doc/src/docbkx/basic-install/src/basic-install_network-common.xml
@@ -13,7 +13,7 @@
Time zone : UTC
- Hostname : folsom-network
+ Hostname : grizzly-networkPackages : OpenSSH-Server
@@ -22,10 +22,10 @@
After OS Installation, reboot the server.
- Since Ubuntu 12.04 LTS has OpenStack Essex by default, we are going to use
- Cloud Archives for Folsom :apt-get install ubuntu-cloud-keyringEdit
+ Since the default OpenStack version in Ubuntu 12.04 LTS is older, we are going to use
+ Cloud Archives for Grizzly :apt-get install ubuntu-cloud-keyringEdit
/etc/apt/sources.list.d/cloud-archive.list
- :deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/folsom main Upgrade
+ :deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/grizzly main Upgrade
the system (and reboot if you need)
:apt-get update && apt-get upgrade
@@ -74,9 +74,9 @@ net.ipv4.conf.default.rp_filter = 0
Edit the /etc/hosts file and
- add folsom-controller, folsom-network and folsom-compute hostnames with correct IP.
+ add grizzly-controller, grizzly-network and grizzly-compute hostnames with correct IP.
diff --git a/doc/src/docbkx/basic-install/src/basic-install_network-operating.xml b/doc/src/docbkx/basic-install/src/basic-install_network-operating.xml
index b51dd6769b..eac5cd8e47 100644
--- a/doc/src/docbkx/basic-install/src/basic-install_network-operating.xml
+++ b/doc/src/docbkx/basic-install/src/basic-install_network-operating.xml
@@ -32,7 +32,7 @@ echo "source novarc">>.bashrc
- Download the Quantum script.
+ Download the Quantum script.
We are using the "Provider Router with Private Networks" use-case.Edit the script belong your networking (public network, floatings IP).
diff --git a/doc/src/docbkx/basic-install/src/basic-install_operate.xml b/doc/src/docbkx/basic-install/src/basic-install_operate.xml
index 2de6e7bac5..885fc3bdf9 100644
--- a/doc/src/docbkx/basic-install/src/basic-install_operate.xml
+++ b/doc/src/docbkx/basic-install/src/basic-install_operate.xml
@@ -23,8 +23,8 @@
spawning a new VM.
- Since Horizon does not manage L3 in Folsom release, we have to configure floating IP from Quantum CLI (using demo tenant).
- To do that, you need to get the ext_net ID and the port_id of your VM :
+ We have to configure floating IP (using demo tenant).
+ To do that using the CLI, you need to get the ext_net ID and the port_id of your VM :
quantum net-list -- --router:external True
quantum port-list -- --device_id <vm-uuid>
diff --git a/doc/src/docbkx/basic-install/src/basic-install_requirements.xml b/doc/src/docbkx/basic-install/src/basic-install_requirements.xml
index ba9fcf336e..00ad7137e7 100644
--- a/doc/src/docbkx/basic-install/src/basic-install_requirements.xml
+++ b/doc/src/docbkx/basic-install/src/basic-install_requirements.xml
@@ -21,9 +21,9 @@
Hostname
-
folsom-controller
-
folsom-network
-
folsom-compute
+
grizzly-controller
+
grizzly-network
+
grizzly-compute
diff --git a/doc/src/docbkx/cli-guide/src/cli_install.xml b/doc/src/docbkx/cli-guide/src/cli_install.xml
index 022150afb2..fd38e040af 100644
--- a/doc/src/docbkx/cli-guide/src/cli_install.xml
+++ b/doc/src/docbkx/cli-guide/src/cli_install.xml
@@ -105,14 +105,7 @@ format="SVG" scale="60"/>
Mac OS X
$ sudo easy_install pip
-
- Ubuntu 11.10 and
- earlier
-
- $ aptitude install python-pip
-
-
-
+ Ubuntu 12.04A packaged version enables
you to use dpkg
diff --git a/doc/src/docbkx/cli-guide/src/glance_cli_howto.xml b/doc/src/docbkx/cli-guide/src/glance_cli_howto.xml
index 9fb3e038c9..45e617751a 100644
--- a/doc/src/docbkx/cli-guide/src/glance_cli_howto.xml
+++ b/doc/src/docbkx/cli-guide/src/glance_cli_howto.xml
@@ -56,7 +56,7 @@
Ensure you have created an image that is OpenStack
compatible. For details, see the Image Management chapter in the
OpenStack Compute Administration
Manual.
diff --git a/doc/src/docbkx/cli-guide/src/keystone_cli_install.xml b/doc/src/docbkx/cli-guide/src/keystone_cli_install.xml
index 36943a62f2..168da7ce43 100644
--- a/doc/src/docbkx/cli-guide/src/keystone_cli_install.xml
+++ b/doc/src/docbkx/cli-guide/src/keystone_cli_install.xml
@@ -40,13 +40,7 @@
$ sudo easy_install pip
-
-
Ubuntu 11.10 and earlier
-
- $ aptitude install python-pip
-
-
-
+
Ubuntu 12.04
There is a packaged version so you can use dpkg or aptitude to install python-keystoneclient.
diff --git a/doc/src/docbkx/common/boot_from_volume.xml b/doc/src/docbkx/common/boot_from_volume.xml
index 927bc02856..c62b59440b 100644
--- a/doc/src/docbkx/common/boot_from_volume.xml
+++ b/doc/src/docbkx/common/boot_from_volume.xml
@@ -6,7 +6,7 @@
version="5.0"
xml:id="boot_from_volume">
Launch from a Volume
- The Compute service has preliminary support for booting an instance from a
+ The Compute service has support for booting an instance from a
volume.Creating a bootable volume
@@ -88,16 +88,12 @@
-
- Because of bug #1008622, you must specify an image when booting from a volume,
- even though this image will not be used.
- The following example will attempt boot from volume with
+
+ The following example will attempt boot from volume with
ID=13, it will not delete on terminate. Replace the
--image flag with a valid image on your system, and the
--key-name with a valid keypair
name:$nova boot --image f4addd24-4e8a-46bb-b15d-fae2591f1a35 --flavor 2 --key-name mykey \
--block-device-mapping vda=13:::0 boot-from-vol-test
-
\ No newline at end of file
+
diff --git a/doc/src/docbkx/common/ch_image_mgmt.xml b/doc/src/docbkx/common/ch_image_mgmt.xml
index 97f448c9d6..a6b6622e77 100644
--- a/doc/src/docbkx/common/ch_image_mgmt.xml
+++ b/doc/src/docbkx/common/ch_image_mgmt.xml
@@ -1350,7 +1350,7 @@ use_cow_images=true
"ACTIVE" state. If this takes longer than five
minutes, here are several hints: - The feature doesn't work while you have
- attached a volume (via nova-volume) to the
+ attached a volume to the
instance. Thus, you should detach the volume
first, create the image, and re-mount the
volume.
diff --git a/doc/src/docbkx/common/getstart.xml b/doc/src/docbkx/common/getstart.xml
index 0ba52100e2..e5fac6bca4 100644
--- a/doc/src/docbkx/common/getstart.xml
+++ b/doc/src/docbkx/common/getstart.xml
@@ -405,7 +405,7 @@ xml:id="ch_getting-started-with-openstack">
xlink:href="http://www.rabbitmq.com/">RabbitMQ
today, but could be any AMPQ message queue (such as Apache
- Qpid). New to the Folsom release is support for
+ Qpid), or
Zero MQ.
@@ -479,11 +479,7 @@ xml:id="ch_getting-started-with-openstack">
Image Store
- The Glance architecture has stayed relatively stable since
- the Cactus release. The biggest architectural change has been
- the addition of authentication, which was added in the Diablo
- release. Just as a quick reminder, Glance has four main parts
- to it:
+ Glance has four main parts to it:
@@ -578,7 +574,7 @@ xml:id="ch_getting-started-with-openstack">
Block Storage
- Cinder separates out the persistent block storage functionality that was previously part of Openstack Compute into it's own service. The OpenStack Block Storage API allows for manipulation of volumes, volume types (similar to compute flavors) and volume snapshots.
+ The OpenStack Block Storage API allows for manipulation of volumes, volume types (similar to compute flavors) and volume snapshots.
diff --git a/doc/src/docbkx/common/glossary/glossary-terms.xml b/doc/src/docbkx/common/glossary/glossary-terms.xml
index 80c1b8d654..f215173225 100644
--- a/doc/src/docbkx/common/glossary/glossary-terms.xml
+++ b/doc/src/docbkx/common/glossary/glossary-terms.xml
@@ -4906,7 +4906,7 @@
volume node
- A nova node that runs the nova-volume
+ A nova node that runs the cinder-volume
daemon.
@@ -4927,10 +4927,10 @@
volume worker
- A nova component that interacts with back-end
+ A cinder component that interacts with back-end
storage to manage the creation and deletion of
volumes and the creation of compute volumes,
- provided by the nova-volume daemon.
+ provided by the cinder-volume daemon.
@@ -4986,7 +4986,7 @@
workerA daemon that carries out tasks. For example,
- the nova-volume worker attaches storage to an VM
+ the cinder-volume worker attaches storage to an VM
instance. Workers listen to a queue and take
action when new messages arrive.
diff --git a/doc/src/docbkx/common/hyper-v.xml b/doc/src/docbkx/common/hyper-v.xml
index a7aefe6617..3c21745bb5 100644
--- a/doc/src/docbkx/common/hyper-v.xml
+++ b/doc/src/docbkx/common/hyper-v.xml
@@ -65,8 +65,8 @@
Enable iSCSI Initiator Service
- To prepare the Hyper-V node to be able to attach to volumes provided by nova-volume or
- cinder you must first make sure the Windows iSCSI initiator service is running and
+ 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.C:\sc start MSiSCSI
diff --git a/doc/src/docbkx/common/introduction-to-xen.xml b/doc/src/docbkx/common/introduction-to-xen.xml
index 04252f4f49..95f8c812cb 100644
--- a/doc/src/docbkx/common/introduction-to-xen.xml
+++ b/doc/src/docbkx/common/introduction-to-xen.xml
@@ -37,7 +37,7 @@ OpenStack with XenAPI supports the following virtual machine image formats:
It is possible to manage Xen using libvirt. This would be
necessary for any Xen-based system that isn't using the XCP
toolstack, such as SUSE Linux or Oracle Linux. Unfortunately,
- this is not well-tested or supported as of the Essex release.
+ this is not well-tested or supported.
To experiment using Xen through libvirt add the following
configuration options
/etc/nova/nova.conf:
diff --git a/doc/src/docbkx/common/monitoring.xml b/doc/src/docbkx/common/monitoring.xml
index e5405b6254..369939ab70 100644
--- a/doc/src/docbkx/common/monitoring.xml
+++ b/doc/src/docbkx/common/monitoring.xml
@@ -72,8 +72,8 @@
better, one can combine the “network” and “host” parts of sFlow data to provide a complex
monitoring solution
- With the advent of Quantum in the Folsom release, the virtual network device moved from
- Linux bridge to OpenvSwitch. If we add KVM or Xen to the mix, we will have sFlow as an applicable
+ Quantum uses OpenvSwitch for the virtual network device.
+ If we add KVM or Xen to the mix, we will have sFlow as an applicable
framework to monitor instances themselves and their virtual network topologies as well.
There are a number of sFlow collectors available. The most widely used seem to be Ganglia and
sFlowTrend, which are free. While Ganglia is focused mainly on monitoring the performance of
diff --git a/doc/src/docbkx/common/nova_cli_boot.xml b/doc/src/docbkx/common/nova_cli_boot.xml
index 058d7a20c2..1daddb81ee 100644
--- a/doc/src/docbkx/common/nova_cli_boot.xml
+++ b/doc/src/docbkx/common/nova_cli_boot.xml
@@ -33,7 +33,7 @@
| flavor | 8GB Standard Instance |
| hostId | |
| id | d8093de0-850f-4513-b202-7979de6c0d55 |
-| image | Ubuntu 11.10 |
+| image | Ubuntu 12.04 |
| metadata | {} |
| name | myUbuntuServer |
| progress | 0 |
@@ -55,4 +55,4 @@
value to log into your server.
-
\ No newline at end of file
+
diff --git a/doc/src/docbkx/common/support.xml b/doc/src/docbkx/common/support.xml
index 53f7fce9bf..ab53e6ba0d 100644
--- a/doc/src/docbkx/common/support.xml
+++ b/doc/src/docbkx/common/support.xml
@@ -71,7 +71,7 @@
in the description. Paste in your command output or stack traces, link to
screenshots, etc. Be sure to include what version of the software you are using.
- This is especially critical if you are using a development branch eg. "Folsom
+ This is especially critical if you are using a development branch eg. "Grizzly
release" vs git commit bc79c3ecc55929bac585d04a03475b72e06a3208. Any deployment specific info is helpful as well. eg.
Ubuntu 12.04, multi-node install.
diff --git a/doc/src/docbkx/openstack-block-storage-admin/drivers/ibm-storwize-svc-driver.xml b/doc/src/docbkx/openstack-block-storage-admin/drivers/ibm-storwize-svc-driver.xml
index 5a850106fe..22c0ad7a3f 100644
--- a/doc/src/docbkx/openstack-block-storage-admin/drivers/ibm-storwize-svc-driver.xml
+++ b/doc/src/docbkx/openstack-block-storage-admin/drivers/ibm-storwize-svc-driver.xml
@@ -62,7 +62,7 @@
be port 22 (SSH).
Make sure the compute node running
- the nova-volume management driver has SSH
+ the cinder-volume management driver has SSH
network access to
the storage system.
@@ -397,4 +397,4 @@ volume_driver=nova.volume.storwize_svc.StorwizeSVCDriver
-
\ No newline at end of file
+
diff --git a/doc/src/docbkx/openstack-block-storage-admin/drivers/xen-sm-driver.xml b/doc/src/docbkx/openstack-block-storage-admin/drivers/xen-sm-driver.xml
index 48f345644c..c519b8b655 100644
--- a/doc/src/docbkx/openstack-block-storage-admin/drivers/xen-sm-driver.xml
+++ b/doc/src/docbkx/openstack-block-storage-admin/drivers/xen-sm-driver.xml
@@ -100,11 +100,11 @@
OperationThe admin uses the nova-manage command
detailed below to add flavors and backends.
- One or more nova-volume service instances
+ One or more cinder-volume service instances
will be deployed per availability zone. When
an instance is started, it will create storage
repositories (SRs) to connect to the backends
- available within that zone. All nova-volume
+ available within that zone. All cinder-volume
instances within a zone can see all the
available backends. These instances are
completely symmetric and hence should be able
@@ -186,7 +186,7 @@ Note: SR type and config connection parameters are in keeping with the XenAPI Co
- Start nova-volume and nova-compute with the new configuration options.
+ Start cinder-volume and nova-compute with the new configuration options.
@@ -204,4 +204,4 @@ Note: SR type and config connection parameters are in keeping with the XenAPI Co
detaching volumes.
-
\ No newline at end of file
+
diff --git a/doc/src/docbkx/openstack-block-storage-admin/troubleshoot-cinder.xml b/doc/src/docbkx/openstack-block-storage-admin/troubleshoot-cinder.xml
index 86e55cf7cb..e1d9e6e305 100644
--- a/doc/src/docbkx/openstack-block-storage-admin/troubleshoot-cinder.xml
+++ b/doc/src/docbkx/openstack-block-storage-admin/troubleshoot-cinder.xml
@@ -23,7 +23,7 @@
state_path and volumes_dir settings
- As of Folsom Cinder is using tgtd
+ Cinder uses tgtd
as the default iscsi helper and implements persistent targets.
This means that in the case of a tgt restart or
even a node reboot your existing volumes on that
diff --git a/doc/src/docbkx/openstack-compute-admin/aboutcompute.xml b/doc/src/docbkx/openstack-compute-admin/aboutcompute.xml
index d145fb3f4c..4eadcb73c7 100644
--- a/doc/src/docbkx/openstack-compute-admin/aboutcompute.xml
+++ b/doc/src/docbkx/openstack-compute-admin/aboutcompute.xml
@@ -139,7 +139,7 @@
Additional resources such as persistent volume storage and
public IP address may be added to and removed from running
- instances. The examples below show the nova-volume service
+ instances. The examples below show the cinder-volume service
which provide persistent block storage as opposed to the
ephemeral storage provided by the instance flavor.
@@ -156,7 +156,7 @@
images. In the cloud there is an available compute
node with available vCPU, memory and local disk
resources. Plus there are a number of predefined
- volumes in the nova-volume service.
+ volumes in the cinder-volume service.
-
-
-
connection_type='libvirt' (Deprecated)
-
libvirt, xenapi, hyperv, or fake; Value that
- indicates the virtualization connection type.
- Deprecated as of Folsom, will be removed in G
- release.
diff --git a/doc/src/docbkx/openstack-install/ap_installingfolsom.xml b/doc/src/docbkx/openstack-install/ap_installingfolsom.xml
index 605b131be9..8c35ab20e9 100644
--- a/doc/src/docbkx/openstack-install/ap_installingfolsom.xml
+++ b/doc/src/docbkx/openstack-install/ap_installingfolsom.xml
@@ -372,7 +372,6 @@ sql_connection=mysql://nova:openstack@10.211.55.20/nova
ec2_url=http://10.211.55.20:8773/services/Cloud
# Auth
-use_deprecated_auth=false
auth_strategy=keystone
keystone_ec2_url=http://10.211.55.20:5000/v2.0/ec2tokens
# Imaging service
@@ -427,7 +426,7 @@ signing_dirname = /tmp/keystone-signing-novaPopulate
network.$nova-manage network create private --fixed_range_v4=192.168.4.32/27 --vlan=100 --num_networks=1 --bridge=br100 --bridge_interface=eth1 --network_size=32
Restart everything.The use of --vlan=100 in the above command is to work
- around a bug in OpenStack Folsom.
+ around a bug in OpenStack.
$cd /etc/init.d/; for i in $( ls nova-* ); do sudo service $i restart; done $service open-iscsi restart$service nova-novncproxy restart
diff --git a/doc/src/docbkx/openstack-install/ch_assumptions.xml b/doc/src/docbkx/openstack-install/ch_assumptions.xml
index a719646548..407f185148 100644
--- a/doc/src/docbkx/openstack-install/ch_assumptions.xml
+++ b/doc/src/docbkx/openstack-install/ch_assumptions.xml
@@ -73,9 +73,8 @@
On Ubuntu, enable the Cloud Archive repository by adding the
- following to
+ xlink:href="https://wiki.ubuntu.com/ServerTeam/CloudArchive">Cloud
+ Archive repository by adding the following to
/etc/apt/sources.list.d/grizzly.list:deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/grizzly mainPrior to running apt-get update and apt-get upgrade, install the keyring :sudo apt-get install ubuntu-cloud-keyring
diff --git a/doc/src/docbkx/openstack-install/ch_externals.xml b/doc/src/docbkx/openstack-install/ch_externals.xml
index 5d14f56840..b40a5b0f82 100644
--- a/doc/src/docbkx/openstack-install/ch_externals.xml
+++ b/doc/src/docbkx/openstack-install/ch_externals.xml
@@ -98,18 +98,11 @@
separate OpenStack project, codenamed Quantum.
- Cinder
- By default, Cinder service uses LVM to create and manage
- local volumes, and exports them via iSCSI using IET or tgt. It can also be
- configured to use other iSCSI-based storage technologies.
- Functionality previously available through nova-volume is now
- available through a separate OpenStack Block Storage
- project, code-named Cinder.
+ OpenStack Block Storage (Cinder)
+ By default, Cinder service uses LVM to create and manage local volumes, and exports them
+ via iSCSI using IET or tgt.
+ It can also be configured to use other iSCSI-based storage technologies.openstack-dashboard
diff --git a/doc/src/docbkx/openstack-install/ch_terminology.xml b/doc/src/docbkx/openstack-install/ch_terminology.xml
index 80b2a343b0..aea89c0d1e 100644
--- a/doc/src/docbkx/openstack-install/ch_terminology.xml
+++ b/doc/src/docbkx/openstack-install/ch_terminology.xml
@@ -263,7 +263,7 @@
data through the operating system at the device level: users access the data by
mounting the remote device in a similar manner to how they would mount a local,
physical disk (e.g., using the "mount" command in Linux). In OpenStack, the
- nova-volume service that forms part of
+ cinder-volume service that forms part of
the Compute service provides this type of functionality, and uses iSCSI to expose
remote data as a SCSI disk that is attached to the network.
Because the data is exposed as a physical device, the end-user is responsible for
diff --git a/doc/src/docbkx/openstack-install/compute-db-sync.xml b/doc/src/docbkx/openstack-install/compute-db-sync.xml
index cbf599a201..90a684f4dc 100644
--- a/doc/src/docbkx/openstack-install/compute-db-sync.xml
+++ b/doc/src/docbkx/openstack-install/compute-db-sync.xml
@@ -25,7 +25,6 @@ sudo start nova-conductor
sudo start nova-network
sudo start nova-scheduler
sudo start nova-novncproxy
-sudo start nova-volume
sudo start libvirt-bin
sudo /etc/init.d/rabbitmq-server restart
diff --git a/doc/src/docbkx/openstack-install/compute-minimum-configuration.xml b/doc/src/docbkx/openstack-install/compute-minimum-configuration.xml
index 2db50bcabb..f5de2ca46e 100644
--- a/doc/src/docbkx/openstack-install/compute-minimum-configuration.xml
+++ b/doc/src/docbkx/openstack-install/compute-minimum-configuration.xml
@@ -89,7 +89,6 @@ flat_network_bridge=br100
#stop nova-network#stop nova-scheduler#stop nova-novncproxy
-#stop nova-volume$>for svc in api objectstore conductor network volume scheduler cert; do sudo service openstack-nova-$svc stop ; sudo chkconfig openstack-nova-$svc on ; done
diff --git a/doc/src/docbkx/openstack-install/compute-sys-requirements.xml b/doc/src/docbkx/openstack-install/compute-sys-requirements.xml
index cb3462eaa2..c9d2f8e5f2 100644
--- a/doc/src/docbkx/openstack-install/compute-sys-requirements.xml
+++ b/doc/src/docbkx/openstack-install/compute-sys-requirements.xml
@@ -82,18 +82,10 @@
xlink:href="http://wiki.openstack.org/Packaging"
>http://wiki.openstack.org/Packaging for additional
links.
- OpenStack Compute requires Ubuntu 12.04
- or later, as the version of libvirt that ships with
- Ubuntu 11.10 does not function properly with OpenStack
- due to bug #1011863.
- OpenStack Compute requires Fedora 16 or
- later, as the version of libvirt that ships with
- Fedora 15 does not function properly with OpenStack
- due to bug #1011863.
+ The Grizzly release of OpenStack Compute
+ requires Ubuntu 12.04 or later.
+ The Grizzly release of OpenStack Compute
+ requires Fedora 16 or later.Database: For
OpenStack Compute, you need access to either a PostgreSQL
diff --git a/doc/src/docbkx/openstack-install/compute-verifying-install.xml b/doc/src/docbkx/openstack-install/compute-verifying-install.xml
index 175c59114f..8d5ffca9ed 100644
--- a/doc/src/docbkx/openstack-install/compute-verifying-install.xml
+++ b/doc/src/docbkx/openstack-install/compute-verifying-install.xml
@@ -11,7 +11,6 @@
Binary Host Zone Status State Updated_At
nova-compute myhost nova enabled :-) 2012-04-02 14:06:15
nova-cert myhost nova enabled :-) 2012-04-02 14:06:16
-nova-volume myhost nova enabled :-) 2012-04-02 14:06:14
nova-scheduler myhost nova enabled :-) 2012-04-02 14:06:11
nova-network myhost nova enabled :-) 2012-04-02 14:06:13
nova-consoleauth myhost nova enabled :-) 2012-04-02 14:06:10
@@ -27,6 +26,5 @@ nova-consoleauth myhost nova enabled :-) 2012-04-02 14:06:10The version number 2013.1 corresponds with the Grizzly
release of Compute.
-
2013.1
diff --git a/doc/src/docbkx/openstack-install/identity-install-keystone.xml b/doc/src/docbkx/openstack-install/identity-install-keystone.xml
index cc92b2b7b8..5edea7af51 100644
--- a/doc/src/docbkx/openstack-install/identity-install-keystone.xml
+++ b/doc/src/docbkx/openstack-install/identity-install-keystone.xml
@@ -113,18 +113,6 @@ sudo chown -R keystone:keystone /etc/keystone/*
linkend="setting-up-tenants-users-and-roles-manually">manual
steps or use a
script.
-
- The parameters --token and
- --endpoint are valid for
- the keystoneclient available after October 2012. Use
- --token and --endpoint
- with the keystoneclient released with the Folsom packaging.
- This install guide documents installing the client from packages,
- but you can use the client from another computer with the CLI Guide instructions for pip install.
-
- Setting up tenants, users, and roles - manuallyYou need to minimally define a tenant, user, and role to
diff --git a/doc/src/docbkx/openstack-network-connectivity-admin/app_demo_single_router.xml b/doc/src/docbkx/openstack-network-connectivity-admin/app_demo_single_router.xml
index 40d9051ace..540105f508 100644
--- a/doc/src/docbkx/openstack-network-connectivity-admin/app_demo_single_router.xml
+++ b/doc/src/docbkx/openstack-network-connectivity-admin/app_demo_single_router.xml
@@ -6,7 +6,7 @@
and its components for the "Use Case: Provider
Router with Private Networks". We will follow the Basic Install document except for the Quantum, Open-vSwitch and Virtual
Networking sections on each of the nodes. The Basic Install document uses gre tunnels. This
diff --git a/doc/src/docbkx/openstack-network-connectivity-admin/ch_adv_features.xml b/doc/src/docbkx/openstack-network-connectivity-admin/ch_adv_features.xml
index d09bc2707b..bbaa0c8912 100644
--- a/doc/src/docbkx/openstack-network-connectivity-admin/ch_adv_features.xml
+++ b/doc/src/docbkx/openstack-network-connectivity-admin/ch_adv_features.xml
@@ -30,7 +30,7 @@
attributes on all virtual networks, and are able to
specify these attributes in order to create provider
networks.
- As of the Folsom release, the provider extension is
+ The provider extension is
supported by the openvswitch and linuxbridge plugins.
Configuration of these plugins requires familiarity with
this extension.
diff --git a/doc/src/docbkx/openstack-network-connectivity-admin/ch_adv_operational_features.xml b/doc/src/docbkx/openstack-network-connectivity-admin/ch_adv_operational_features.xml
index 7e96ffb25c..c997eb9e9d 100644
--- a/doc/src/docbkx/openstack-network-connectivity-admin/ch_adv_operational_features.xml
+++ b/doc/src/docbkx/openstack-network-connectivity-admin/ch_adv_operational_features.xml
@@ -252,8 +252,9 @@ $ quantum ext-show quotas
| updated | 2012-07-29T10:00:00-00:00 |
+-------------+------------------------------------------------------------+
- In Folsom release, per-tenant quota is supported by Open vSwitch plugin,
- Linux Bridge plugin, and Nicira NVP plugin and cannot be used with other plugins.
+ Per-tenant quotas are supported only supported by some plugins. At least Open vSwitch,
+ Linux Bridge, and Nicira NVP are known to work but new versions of other plugins may
+ bring additional functionality - consult the documentation for each plugin.
There are four CLI commands to manage per-tenant quota.
diff --git a/doc/src/docbkx/openstack-network-connectivity-admin/ch_install.xml b/doc/src/docbkx/openstack-network-connectivity-admin/ch_install.xml
index 3703ed9ae5..a03ee4e854 100644
--- a/doc/src/docbkx/openstack-network-connectivity-admin/ch_install.xml
+++ b/doc/src/docbkx/openstack-network-connectivity-admin/ch_install.xml
@@ -23,9 +23,9 @@
xlink:href="http://blog.canonical.com/2012/09/14/now-you-can-have-your-openstack-cake-and-eat-it/"
>http://bit.ly/Q8OJ9M
- Point to Folsom PPAs:
+ Point to Grizzly PPAs:
- #echo deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/folsom main >> /etc/apt/sources.list.d/folsom.list
+ #echo deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/grizzly main >>/etc/apt/sources.list.d/grizzly.list#apt-get install ubuntu-cloud-keyring #apt-get update#apt-get upgrade
diff --git a/www/grizzly/index.html b/www/grizzly/index.html
new file mode 100644
index 0000000000..c3d02f4956
--- /dev/null
+++ b/www/grizzly/index.html
@@ -0,0 +1,204 @@
+
+
+
+
+
+
+
+
+ OpenStack Docs: Grizzly
+
+
+
+
+
+
+
+
+
+
+
+
+