openstack/openstack-manuals
Code Issues Proposed changes

Merge "Follow rename of glance settings in nova.conf"

Browse Source
This commit is contained in:
Jenkins 2014-08-24 21:34:46 +00:00 committed by Gerrit Code Review
commit 8de219010c
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/common/samples/nova.conf
View File

@ -32,7 +32,6 @@ rabbit_host=192.168.206.130
# GLANCE
image_service=nova.image.glance.GlanceImageService
glance_api_servers=192.168.206.130:9292
# NETWORK
network_manager=nova.network.manager.FlatDHCPManager
@ -63,6 +62,10 @@ admin_user = nova
admin_password = nova
signing_dirname = /tmp/keystone-signing-nova
# GLANCE
[glance]
api_servers=192.168.206.130:9292
# DATABASE
[database]
connection=mysql://nova:yourpassword@192.168.206.130/nova

5
doc/common/samples/nova.conf-yum
View File

@ -34,7 +34,6 @@ qpid_hostname=192.168.206.130
# GLANCE
image_service=nova.image.glance.GlanceImageService
glance_api_servers=192.168.206.130:9292
# NETWORK
network_manager=nova.network.manager.FlatDHCPManager
@ -66,6 +65,10 @@ admin_user = nova
admin_password = nova
signing_dirname = /tmp/keystone-signing-nova
# GLANCE
[glance]
api_servers=192.168.206.130:9292
# DATABASE
[database]
connection=mysql://nova:yourpassword@192.168.206.130/nova

3
doc/config-reference/compute/section_hypervisor_hyper-v.xml
View File

@ -317,12 +317,13 @@ instances_path=e:\Hyper-V\instances
policy_file=C:\Program Files (x86)\OpenStack\nova\etc\nova\policy.json
api_paste_config=c:\openstack\nova\etc\nova\api-paste.ini
rabbit_host=<replaceable>IP_ADDRESS</replaceable>
glance_api_servers=<replaceable>IP_ADDRESS</replaceable>:9292
image_service=nova.image.glance.GlanceImageService
instances_shared_storage=false
limit_cpu_features=true
compute_driver=nova.virt.hyperv.driver.HyperVDriver
volume_api_class=nova.volume.cinder.API
[glance]
api_servers=<replaceable>IP_ADDRESS</replaceable>:9292
[database]
connection=mysql://nova:passwd@<replaceable>IP_ADDRESS</replaceable>/nova</programlisting>
<para><xref linkend="config_table_nova_hyperv"/> contains a reference of all

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

@ -110,11 +110,11 @@ novncproxy_base_url = http://<replaceable>controller</replaceable>:6080/vnc_auto
</note>
</step>
<step>
<para>In the <literal>[DEFAULT]</literal> section, configure the
<para>In the <literal>[glance]</literal> section, configure the
location of the Image Service:</para>
<programlisting language="ini">[DEFAULT]
<programlisting language="ini">[glance]
...
glance_host = <replaceable>controller</replaceable></programlisting>
host = <replaceable>controller</replaceable></programlisting>
</step>
</substeps>
</step>