From 8c442aef4ae437003ec301509c0e64b77aff2743 Mon Sep 17 00:00:00 2001
From: Matt Kassawara <mkassawara@gmail.com>
Date: Thu, 6 Mar 2014 18:34:52 -0700
Subject: [PATCH] Removed extraneous packages from Nova controller section

On Ubuntu, I removed the following extraneous packages from the list
of packages to install:

nova-ajax-console-proxy
nova-doc
novnc

I also combined the Ubuntu and Debian steps since they install the
same packages.

On RHEL-style distributions, the 'openstack-nova' meta-package also
installs compute services not necessary on the controller node. I
replaced this meta-package with the individual packages containing
only the controller services.

Change-Id: I8e7ba80124d8409410b03724ac6ab336355935e8
Closes-Bug: #1287918
Closes-Bug: #1287969
---
 doc/install-guide/section_nova-controller.xml | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/doc/install-guide/section_nova-controller.xml b/doc/install-guide/section_nova-controller.xml
index 8030b7099f..8484e9e711 100644
--- a/doc/install-guide/section_nova-controller.xml
+++ b/doc/install-guide/section_nova-controller.xml
@@ -12,23 +12,13 @@
     node.</para>
   <procedure>
     <step>
-      <para os="fedora;rhel;centos">Install the
-          <package>openstack-nova</package> meta-package, which
-        installs various Compute packages that are used on the
-        controller node.</para>
-      <screen os="fedora;rhel;centos"><prompt>#</prompt> <userinput>yum install openstack-nova python-novaclient</userinput></screen>
-      <para os="ubuntu;debian;opensuse;sles">Install these Compute
-        packages, which provide the Compute services that run on the
-        controller node.</para>
-      <screen os="ubuntu"><prompt>#</prompt> <userinput>apt-get install nova-novncproxy novnc nova-api \
-  nova-ajax-console-proxy nova-cert nova-conductor \
-  nova-consoleauth nova-doc nova-scheduler \
+      <para>Install the Compute packages necessary for the controller
+        node.</para>
+      <screen os="fedora;rhel;centos"><prompt>#</prompt> <userinput>yum install openstack-nova-api openstack-nova-cert openstack-nova-conductor \
+  openstack-nova-console openstack-nova-novncproxy openstack-nova-scheduler \
   python-novaclient</userinput></screen>
-
-      <screen os="debian"><prompt>#</prompt> <userinput>apt-get install nova-consoleproxy nova-api \
-  nova-cert nova-conductor nova-consoleauth \
-  nova-scheduler python-novaclient</userinput></screen>
-
+      <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install nova-api nova-cert nova-conductor nova-consoleauth \
+  nova-novncproxy nova-scheduler python-novaclient</userinput></screen>
       <screen os="opensuse;sles"><prompt>#</prompt> <userinput>zypper install openstack-nova-api openstack-nova-scheduler \
   openstack-nova-cert openstack-nova-conductor openstack-nova-console \
   openstack-nova-consoleauth openstack-nova-doc \