nova.conf sample in install needs second copy for RHEL qpid config

[Anne Gentle]

Reported in http://docs.openstack.org/folsom/openstack-compute/install/yum/content/compute-minimum-configuration-settings.html#comment-722872116

The example nova.conf here uses the rabbit_host but the setup directions have the user install qpid. The correct statement would be to remove the rabbit_host and replace it with the qpid tag: "qpid_hostname=hostname.example.com"

To fix, create a second copy of samples/nova.conf, then in the places where nova.conf is xi:included, make two includes, one for each conditional output.

Do in the master branch and also backport to stable/folsom.

[Tom Fifield (fifieldt)]

https://review.openstack.org/17303

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/17303
Committed: http://github.com/openstack/openstack-manuals/commit/14a2fadca34c524dbaa0cf7b9c84eaa9cdca7f80
Submitter: Jenkins
Branch: master

commit 14a2fadca34c524dbaa0cf7b9c84eaa9cdca7f80
Author: Tom Fifield <email address hidden>
Date: Sun Dec 2 18:20:51 2012 +1100

    Add nova.conf sample for use in yum installs

    fixes bug 1085411

    Duplicates the current nova.conf sample for yum installs
    since they need QPID instead of rabbit. Adds some include logic
    to refer to the appropriate conf.

    Change-Id: Ibba4e7d0b8a1b5e5a8108c2b393b650d63a5f621

[Anne Gentle (annegentle)]

Setting back to Confirmed as the Rabbit setting shows up in trunk/openstack-install/yum/ currently.

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/26019
Committed: http://github.com/openstack/openstack-manuals/commit/25afe181e990d34be2a2d7d8b8554cb14c763133
Submitter: Jenkins
Branch: master

commit 25afe181e990d34be2a2d7d8b8554cb14c763133
Author: philhopkins-a <email address hidden>
Date: Wed Apr 3 11:46:54 2013 -0500

    Change to show which nova services should run on the controller and the compute nodes

    Patchset to fix bug 1085411, separate nova.conf with qpid settings
    Also updates Object Storage version to 1.8.0

    Change-Id: I05b63f7e23acb739a5ee6050906d7cf49c3cbd25