Merge "Removed instructions to copy .conf files"

This commit is contained in:
Jenkins 2013-11-12 15:05:35 +00:00 committed by Gerrit Code Review
commit 5275a0221e

View File

@ -87,26 +87,23 @@
<step os="ubuntu"> <step os="ubuntu">
<para>Due to <link <para>Due to <link
xlink:href="https://bugs.launchpad.net/ubuntu/+source/linux/+bug/759725" xlink:href="https://bugs.launchpad.net/ubuntu/+source/linux/+bug/759725"
>this bug</link> that is marked <literal>Won't >this bug</link>, which is marked <literal>Won't
Fix</literal>, guestfs is restricted. Run this command to Fix</literal>, guestfs is restricted. Run this command to
relax the restriction:</para> relax the restriction:</para>
<screen><prompt>#</prompt> <userinput>chmod 0644 /boot/vmlinuz*</userinput></screen> <screen><prompt>#</prompt> <userinput>chmod 0644 /boot/vmlinuz*</userinput></screen>
</step> </step>
<step os="rhel;centos;fedora"> <step os="rhel;centos;fedora">
<para>Either copy and modify the <para>Edit the <filename>/etc/nova/nova.conf</filename> configuration file:</para>
<filename>/etc/nova/nova.conf</filename> file from the <screen os="fedora;rhel;centos;opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf database connection mysql://nova:<replaceable>NOVA_DBPASS</replaceable>@controller/nova</userinput>
<replaceable>controller</replaceable> node, or run the same
configuration commands.</para>
<screen os="fedora;rhel;centos;opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf \
database connection mysql://nova:<replaceable>NOVA_DBPASS</replaceable>@controller/nova</userinput>
<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT auth_strategy keystone</userinput> <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT auth_strategy keystone</userinput>
<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT auth_host <replaceable>controller</replaceable></userinput> <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT auth_host <replaceable>controller</replaceable></userinput>
<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT admin_user nova</userinput> <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT admin_user nova</userinput>
<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT admin_tenant_name service</userinput> <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT admin_tenant_name service</userinput>
<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT admin_password <replaceable>NOVA_PASS</replaceable></userinput> <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT admin_password <replaceable>NOVA_PASS</replaceable></userinput></screen>
</screen> <screen os="fedora;rhel;centos"><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT rpc_backend nova.openstack.common.rpc.impl_qpid</userinput>
<para os="ubuntu;debian">Edit the <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT qpid_hostname <replaceable>controller</replaceable></userinput></screen>
<filename>/etc/nova/nova.conf</filename> file and add these <para os="ubuntu;debian">Edit the
<filename>/etc/nova/nova.conf</filename> configuration file and add these
lines to the appropriate sections:</para> lines to the appropriate sections:</para>
<programlisting os="ubuntu;debian" language="ini">... <programlisting os="ubuntu;debian" language="ini">...
[DEFAULT] [DEFAULT]
@ -116,17 +113,14 @@ auth_strategy=keystone
[database] [database]
# The SQLAlchemy connection string used to connect to the database # The SQLAlchemy connection string used to connect to the database
connection = mysql://nova:NOVA_DBPASS@controller/nova</programlisting> connection = mysql://nova:NOVA_DBPASS@controller/nova</programlisting>
</step>
<screen os="fedora;rhel;centos"><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf \ <step os="ubuntu;debian">
DEFAULT rpc_backend nova.openstack.common.rpc.impl_qpid</userinput> <para>Configure the Compute service to use the RabbitMQ message
<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT qpid_hostname <replaceable>controller</replaceable></userinput></screen> broker by setting these configuration keys in the
<literal>DEFAULT</literal> configuration group of the
<filename>/etc/nova/nova.conf</filename> file:</para>
<para os="ubuntu;debian">Configure the Compute service to use <programlisting os="ubuntu;debian" language="ini">
the RabbitMQ message broker by setting these configuration rpc_backend = nova.rpc.impl_kombu
keys in the <literal>DEFAULT</literal> configuration group of
the <filename>/etc/nova/nova.conf</filename> file:</para>
<programlisting os="ubuntu;debian" language="ini">rpc_backend = nova.rpc.impl_kombu
rabbit_host = controller</programlisting> rabbit_host = controller</programlisting>
</step> </step>
@ -165,10 +159,9 @@ glance_host=<replaceable>controller</replaceable></programlisting>
</step> </step>
<step> <step>
<para>Copy the <filename>/etc/nova/api-paste.ini</filename> file <para>Edit the <filename>/etc/nova/api-paste.ini</filename>
from the <replaceable>controller</replaceable> node, or edit configuration file to add the credentials to the
the file to add the credentials to the <literal>[filter:authtoken]</literal> section:</para>
<literal>[filter:authtoken]</literal> section:</para>
<programlisting language="ini">[filter:authtoken] <programlisting language="ini">[filter:authtoken]
paste.filter_factory=keystoneclient.middleware.auth_token:filter_factory paste.filter_factory=keystoneclient.middleware.auth_token:filter_factory
auth_host=controller auth_host=controller