diff --git a/doc/common/ch_getstart.xml b/doc/common/ch_getstart.xml
index 0d8cfe465c..2d57009313 100644
--- a/doc/common/ch_getstart.xml
+++ b/doc/common/ch_getstart.xml
@@ -57,7 +57,7 @@
Manages the lifecycle of compute instances in an
OpenStack environment. Responsibilities include
- spawning, scheduling and decomissioning of
+ spawning, scheduling and decomissioning of virtual
machines on demand. |
@@ -160,8 +160,9 @@
>Heat
Orchestrates multiple composite cloud applications by using
- either the native HOT template format or the AWS
- CloudFormation template format, through both an
+ either the native HOT template format or the
+ AWS CloudFormation template format, through both an
OpenStack-native REST API and a CloudFormation-compatible
Query API. |
diff --git a/doc/install-guide/section_basics-database.xml b/doc/install-guide/section_basics-database.xml
index 3a04bf3f9c..c9b64e4b29 100644
--- a/doc/install-guide/section_basics-database.xml
+++ b/doc/install-guide/section_basics-database.xml
@@ -8,16 +8,16 @@
services require a database to store information. These examples
use a MySQL database that runs on the controller node. You must
install the MySQL database on the controller node. You must
- install MySQL client software on any additional nodes that
+ install the MySQL Python library on any additional nodes that
access MySQL.
Most OpenStack services require a
database to store information. This guide uses a MySQL database
on SUSE Linux Enterprise Server and a compatible database on
openSUSE running on the controller node. This compatible
database for openSUSE is MariaDB. You must install the MariaDB
- database on the controller node. You must install the MariaDB
- client software on any nodes that access the MariaDB
- database.
+ database on the controller node. You must install the MySQL
+ Python library on any additional nodes that access MySQL or MariaDB.
+
Controller setup
For SUSE Linux Enterprise Server:
@@ -74,7 +74,7 @@ character-set-server = utf8
os="rhel;fedora;centos">MySQL
MariaDB or MySQL database
server and set it to start automatically when the system
- boots.
+ boots:
# service mysqld start
# chkconfig mysqld on
# service mysql start
@@ -105,16 +105,9 @@ character-set-server = utf8
Node setup
On all nodes other than the controller node, install the
- MySQL
- MariaDB (on openSUSE) client
- and the MySQL Python library on any system that does not
- host a MySQL database:
+ MySQL Python library:
# apt-get install python-mysqldb
- # yum install mysql MySQL-python
- # zypper install mariadb-client python-mysql
- For SUSE Linux Enterprise, install
- MySQL:
- # zypper install mysql-client python-mysql
+ # yum install MySQL-python
+ # zypper install python-mysql
diff --git a/doc/install-guide/section_basics-ntp.xml b/doc/install-guide/section_basics-ntp.xml
index 52f45b30ed..781ba0bf4a 100644
--- a/doc/install-guide/section_basics-ntp.xml
+++ b/doc/install-guide/section_basics-ntp.xml
@@ -10,20 +10,20 @@
node as the reference server and any additional nodes to set
their time from the controller node.
Install the ntp package on each system
- running OpenStack services.
+ running OpenStack services:
# apt-get install ntp
# yum install ntp
# zypper install ntp
Set up the NTP server
on your controller node so that it receives data by modifying
the ntp.conf file and restarting the
- service.
+ service:
# service ntpd start
# chkconfig ntpd on
# service ntp start
# chkconfig ntp on
- On additional nodes, it is advised that you configure the
- other nodes to synchronize their time from the controller node
+ It is advised that you configure additional nodes
+ to synchronize their time from the controller node
rather than from outside of your LAN. To do so, install the ntp
daemon as above, then edit /etc/ntp.conf
and change the server
directive to use the
diff --git a/doc/install-guide/section_basics-packages.xml b/doc/install-guide/section_basics-packages.xml
index 2b8cab7c44..25e25f7485 100644
--- a/doc/install-guide/section_basics-packages.xml
+++ b/doc/install-guide/section_basics-packages.xml
@@ -16,7 +16,7 @@
on Red Hat Enterprise Linux 6, compatible versions of CentOS,
and Fedora 20. To enable the RDO repository, download and
install the rdo-release-icehouse
- package.
+ package:
# yum install http://repos.fedorapeople.org/repos/openstack/openstack-icehouse/rdo-release-icehouse-1.noarch.rpm
The EPEL package includes GPG keys
for package signing and repository information. This should only
@@ -32,7 +32,7 @@
programs that make installation and configuration easier. These
programs are used throughout this guide. Install
openstack-utils. This verifies that you can
- access the RDO repository.
+ access the RDO repository:
# yum install openstack-utils
Use the Open Build Service repositories
for Icehouse based on your openSUSE or
@@ -67,7 +67,7 @@
openstack-selinux package includes the
policy files that are required to configure SELinux during
OpenStack installation.
- Install openstack-selinux.
+ Install openstack-selinux:
# yum install openstack-selinux
Upgrade your system packages:
# yum upgrade
@@ -90,10 +90,22 @@
# add-apt-repository cloud-archive:icehouse
- Update the package database, upgrade your system, and reboot
- for all changes to take effect:
- # apt-get update && apt-get dist-upgrade
-# reboot
+ Update the package database and upgrade your system:
+ # apt-get update
+# apt-get dist-upgrade
+# reboot
+
+
+ If you intend to use OpenStack Networking with Ubuntu 12.04,
+ you should install a backported Linux kernel to improve the
+ stability of your system. This installation is not needed if you
+ intend to use the legacy networking service.
+ Install the Ubuntu 13.10 backported kernel:
+ # apt-get install linux-image-generic-lts-saucy linux-headers-generic-lts-saucy
+
+
+ Reboot the system for all changes to take effect:
+ # reboot
diff --git a/doc/install-guide/section_basics-passwords.xml b/doc/install-guide/section_basics-passwords.xml
index 9db32b6eb8..c1400a26a0 100644
--- a/doc/install-guide/section_basics-passwords.xml
+++ b/doc/install-guide/section_basics-passwords.xml
@@ -16,7 +16,7 @@
This guide uses the convention that
SERVICE_PASS is
- password to access the service SERVICE and
+ the password to access the service SERVICE and
SERVICE_DBPASS is
the database password used by the service SERVICE to access the
database.