openstack/openstack-manuals
Code Issues Proposed changes

consistency: NOVA_PASS -> NOVA_DBPASS

Browse Source 
The chapter sometimes used NOVA_PASS, sometimes NOVA_DBPASS,
this has now been changed to NOVA_DBPASS everywhere.

Change-Id: I57e946fcf338cbffebee2c8731cb696643312da4
This commit is contained in:
Andreas Jaeger 2013-10-13 18:12:26 +02:00
parent fd7f4dac76
commit fa0b664228
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/install-guide/section_nova-compute.xml
View File

@ -55,7 +55,7 @@
<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></screen> <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT admin_password <replaceable>NOVA_DBPASS</replaceable></userinput></screen>
<para os="ubuntu;debian">Edit <filename>/etc/nova/nova.conf</filename> and add to the <literal>[DEFAULT]</literal> section.</para> <para os="ubuntu;debian">Edit <filename>/etc/nova/nova.conf</filename> and add to the <literal>[DEFAULT]</literal> section.</para>
<programlisting os="ubuntu;debian" language="ini">... <programlisting os="ubuntu;debian" language="ini">...
[DEFAULT] [DEFAULT]
@ -64,7 +64,7 @@ auth_strategy=keystone
auth_host=<replaceable>controller</replaceable> auth_host=<replaceable>controller</replaceable>
admin_user=nova admin_user=nova
admin_tenant_name=service admin_tenant_name=service
admin_password=<replaceable>NOVA_PASS</replaceable></programlisting> admin_password=<replaceable>NOVA_DBPASS</replaceable></programlisting>
<screen os="fedora;rhel;centos"><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf \ <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> DEFAULT rpc_backend nova.openstack.common.rpc.impl_qpid</userinput>
@ -109,7 +109,7 @@ paste.filter_factory=keystoneclient.middleware.auth_token:filter_factory
auth_host=controller auth_host=controller
admin_user=nova admin_user=nova
admin_tenant_name=service admin_tenant_name=service
admin_password=<replaceable>NOVA_PASS</replaceable> admin_password=<replaceable>NOVA_DBPASS</replaceable>
</programlisting> </programlisting>
<note os="fedora;rhel;centos;opensuse"><para>Ensure that <filename>api_paste_config=/etc/nova/api-paste.ini</filename> is set in <note os="fedora;rhel;centos;opensuse"><para>Ensure that <filename>api_paste_config=/etc/nova/api-paste.ini</filename> is set in
<filename>/etc/nova/nova.conf</filename>.</para></note> <filename>/etc/nova/nova.conf</filename>.</para></note>

8
doc/install-guide/section_nova-controller.xml
View File

@ -97,7 +97,7 @@ vncserver_proxyclient_address=192.168.0.10
<literal>service</literal> tenant and give the user the <literal>service</literal> tenant and give the user the
<literal>admin</literal> role.</para> <literal>admin</literal> role.</para>
<screen><prompt>#</prompt> <userinput>keystone user-create --name=nova --pass=<replaceable>NOVA_PASS</replaceable> --email=<replaceable>nova@example.com</replaceable></userinput> <screen><prompt>#</prompt> <userinput>keystone user-create --name=nova --pass=<replaceable>NOVA_DBPASS</replaceable> --email=<replaceable>nova@example.com</replaceable></userinput>
<prompt>#</prompt> <userinput>keystone user-role-add --user=nova --tenant=service --role=admin</userinput></screen> <prompt>#</prompt> <userinput>keystone user-role-add --user=nova --tenant=service --role=admin</userinput></screen>
</step> </step>
<step> <step>
@ -108,7 +108,7 @@ vncserver_proxyclient_address=192.168.0.10
<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></screen> <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT admin_password <replaceable>NOVA_DBPASS</replaceable></userinput></screen>
<para os="ubuntu;debian">Edit <filename>/etc/nova/nova.conf</filename> and add to the <literal>[DEFAULT]</literal> section.</para> <para os="ubuntu;debian">Edit <filename>/etc/nova/nova.conf</filename> and add to the <literal>[DEFAULT]</literal> section.</para>
<programlisting os="ubuntu;debian" language="ini"> <programlisting os="ubuntu;debian" language="ini">
... ...
@ -118,7 +118,7 @@ auth_strategy=keystone
auth_host=<replaceable>controller</replaceable> auth_host=<replaceable>controller</replaceable>
admin_user=nova admin_user=nova
admin_tenant_name=service admin_tenant_name=service
admin_password=<replaceable>NOVA_PASS</replaceable> admin_password=<replaceable>NOVA_DBPASS</replaceable>
</programlisting> </programlisting>
@ -136,7 +136,7 @@ paste.filter_factory=keystoneclient.middleware.auth_token:filter_factory
auth_host=<replaceable>controller</replaceable> auth_host=<replaceable>controller</replaceable>
admin_user=nova admin_user=nova
admin_tenant_name=service admin_tenant_name=service
admin_password=<replaceable>NOVA_PASS</replaceable> admin_password=<replaceable>NOVA_DBPASS</replaceable>
</programlisting> </programlisting>
<note os="fedora;rhel;centos;opensuse;debian"><para>Ensure that <literal>api_paste_config=/etc/nova/api-paste.ini</literal> <note os="fedora;rhel;centos;opensuse;debian"><para>Ensure that <literal>api_paste_config=/etc/nova/api-paste.ini</literal>
is set in <filename>/etc/nova/nova.conf</filename>.</para></note> is set in <filename>/etc/nova/nova.conf</filename>.</para></note>