diff --git a/doc/install-guide/ch_basics.xml b/doc/install-guide/ch_basics.xml
index 4f8a9392de..afaad84360 100644
--- a/doc/install-guide/ch_basics.xml
+++ b/doc/install-guide/ch_basics.xml
@@ -36,13 +36,12 @@
guide assumes that each node can reach the other nodes on the internal
network using hostnames like controller and
compute1.
-
- Start by disabling the NetworkManager service and
+ Start by disabling the NetworkManager service and
enabling the network service. The
network service is more suitable for the static
network configuration done in this guide.
- #service NetworkManager stop
+ #service NetworkManager stop#service network start#chkconfig NetworkManager off#chkconfig network on
@@ -72,8 +71,16 @@
creating the compute node, use 192.168.0.11 and
10.0.0.11 instead. Additional nodes added in later
chapters will follow this pattern.
+
+ Basic Architecture
+
+
+
+
+
+
-
+ <filename>/etc/sysconfig/network-scripts/ifcfg-eth0</filename># Internal Network
DEVICE=eth0
@@ -85,7 +92,7 @@ DEFROUTE=yes
ONBOOT=yes
-
+ <filename>/etc/sysconfig/network-scripts/ifcfg-eth1</filename># External Network
DEVICE=eth1
@@ -97,6 +104,40 @@ DEFROUTE=yes
ONBOOT=yes
+
+ <filename>/etc/sysconfig/network-scripts/ifcfg-eth0</filename>
+ # Internal Network
+FIXME
+
+
+
+ <filename>/etc/sysconfig/network-scripts/ifcfg-eth1</filename>
+ # External Network
+FIXME
+
+
+
+ <filename>/etc/network/interfaces</filename>
+ # Internal Network
+auto eth0
+iface eth0 inet static
+ address 192.168.0.10
+ netmask 255.255.255.0
+
+# External Network
+auto eth1
+iface eth1 inet static
+ address 10.0.0.10
+ netmask 255.255.255.0
+
+
+
+ Once you've configured the network, restart the daemon for changes to take effect:
+
+ #service networking restart
+ #service network restart
+ #service FIXME restart
+
Set the hostname of each machine. Name the controller node
controller and the first compute node
compute1. These are the hostnames used in the
@@ -149,14 +190,10 @@ ONBOOT=yes
#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.
+ Set up the NTP server on your
+ controller node so that it receives data by modifying the ntp.conf
+ file and restarting the service.
-
- #sed -i 's/server ntp.ubuntu.com/server ntp.ubuntu.com\nserver 127.127.1.0\nfudge 127.127.1.0 stratum 10/g' /etc/ntp.conf
-#service ntp restart
-#chkconfig ntpd on#service ntpd start#chkconfig ntpd on#systemctl start ntp.service
@@ -197,18 +234,23 @@ hwclock -w
#yum install mysql MySQL-python#zypper install mysql-community-server-client python-mysql
- Start the MySQL database server and set it to start automatically when
+ When you install the server package, you will
+ be asked to enter a root password for the database. Be sure to choose
+ a strong password and remember it - it will be needed later.
+
+ Start the MySQL database server and set it to start automatically when
the system boots.
- #service mysqld start
+ #service mysqld start#chkconfig mysqld on#systemctl enable mysqld.service#systemctl enable mysqld.service
- Finally, it's a good idea to set a root password for your MySQL
+ Finally, it's a good idea to set a root password for your MySQL
database. The OpenStack programs that set up databases and tables will
prompt you for this password if it's set.
- #mysqladmin password newPassword
+ #mysqladmin password newPassword
+ Enter your desired password when prompted.Messaging Server
@@ -247,7 +289,7 @@ hwclock -w
OpenStack Packages
- Distributions releases and OpenStack releases are independent of
+ Distribution releases and OpenStack releases are often independent of
each other and thus you might need to add some extra steps to access
the latest OpenStack release after installation of the machine before
installation of any OpenStack packages.
@@ -284,6 +326,9 @@ hwclock -w
To use the Ubuntu Cloud Archive for Havana
+ The Ubuntu Cloud Archive
+ is a special repository that allows you to install newer releases of OpenStack on
+ the stable supported version of Ubuntu.Install the keyring:
#apt-get install ubuntu-cloud-keyring
@@ -302,7 +347,7 @@ hwclock -w
-
+ Congratulations, now you are ready to start installing OpenStack services!
diff --git a/doc/install-guide/ch_keystone.xml b/doc/install-guide/ch_keystone.xml
index 4198ca2f92..799b880016 100644
--- a/doc/install-guide/ch_keystone.xml
+++ b/doc/install-guide/ch_keystone.xml
@@ -5,12 +5,6 @@
xml:id="ch_keystone">
Configuring the Identity Service
-
-
diff --git a/doc/install-guide/section_keystone-install.xml b/doc/install-guide/section_keystone-install.xml
index d195297dd4..45560aa07c 100644
--- a/doc/install-guide/section_keystone-install.xml
+++ b/doc/install-guide/section_keystone-install.xml
@@ -19,11 +19,19 @@
with the username keystone. Replace
KEYSTONE_DBPASS
with a suitable password for the database user.
- #openstack-config --set /etc/keystone/keystone.conf \
+ #openstack-config --set /etc/keystone/keystone.conf \
sql connection mysql://keystone:KEYSTONE_DBPASS@controller/keystone
+ Edit /etc/keystone/keystone.conf and change the [sql] section.
+
+...
+[sql]
+# The SQLAlchemy connection string used to connect to the database
+connection = mysql://keystone:KEYSTONE_DBPASS@controller/keystone
+...
+
-
+ Use the openstack-db command to create the
database and tables, as well as a database user called
keystone to connect to the database. Replace
@@ -32,6 +40,20 @@
#openstack-db --init --service keystone --password KEYSTONE_DBPASS
+
+ First, we need to create a database user called keystone, by logging in
+ as root using the password we set earlier.
+ #mysql -u root -p
+mysql>CREATE DATABASE keystone;
+mysql>GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'localhost' \
+IDENTIFIED BY 'KEYSTONE_DBPASS';
+
+
+ We now start the keystone service and create its tables.
+ #keystone-manage db_sync
+#service keystone restart
+
+
You need to define an authorization token that is used as a
shared secret between the Identity Service and other OpenStack services.
@@ -40,20 +62,35 @@
#ADMIN_TOKEN=$(openssl rand -hex 10)#echo $ADMIN_TOKEN#openstack-config --set /etc/keystone/keystone.conf DEFAULT admin_token $ADMIN_TOKEN
+ #openssl rand -hex 10
+Edit /etc/keystone/keystone.conf and
+ change the [DEFAULT] section, replacing ADMIN_TOKEN with the results of the command.
+
+[DEFAULT]
+# A "shared secret" between keystone and other openstack services
+admin_token = ADMIN_TOKEN
+...
+
+
-
+
+ By default Keystone will use PKI tokens. Create the signing
keys and certificates.#keystone-manage pki_setup --keystone-user keystone --keystone-group keystone#chown -R keystone:keystone /etc/keystone/* /var/log/keystone/keystone.log
-
- Start the Identiy Service and enable it so it start when
+
+ Restart the Identity service.
+ #service keystone restart
+
+
+
+
+ Start the Identity Service and enable it so it start when
the system boots.
- #service keystone start
-#chkconfig keystone on#service openstack-keystone start#chkconfig openstack-keystone on#systemctl start openstack-keystone.service
diff --git a/www/trunk/index.html b/www/trunk/index.html
index 8878bf9a73..63051650a1 100644
--- a/www/trunk/index.html
+++ b/www/trunk/index.html
@@ -176,7 +176,7 @@