openstack/openstack-manuals
Code Issues Proposed changes

Use correct language for Bash and Python snippets.

Browse Source 
Change-Id: If417af59574802c75b4721559c05bc5a2271df61
This commit is contained in:
Stephen Gordon 2013-10-14 21:22:02 -04:00
parent 77f5b721c0
commit 54a001c90e
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/install-guide/ch_installnetworking.xml
View File

@ -581,7 +581,7 @@ password = "PLUMgrid-director-admin-password"</programlisting>
<para>The following DHCP agent options are required in the <para>The following DHCP agent options are required in the
<filename>/etc/neutron/dhcp_agent.ini</filename> file for <filename>/etc/neutron/dhcp_agent.ini</filename> file for
the OVS plugin:</para> the OVS plugin:</para>
<programlisting language="bash">[DEFAULT] <programlisting language="ini">[DEFAULT]
ovs_use_veth = True ovs_use_veth = True
enable_isolated_metadata = True enable_isolated_metadata = True
use_namespaces = True use_namespaces = True
@ -592,7 +592,7 @@ interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver</programlist
<para>The following DHCP agent options are required in the <para>The following DHCP agent options are required in the
<filename>/etc/neutron/dhcp_agent.ini</filename> file for <filename>/etc/neutron/dhcp_agent.ini</filename> file for
the NVP plugin:</para> the NVP plugin:</para>
<programlisting language="bash">[DEFAULT] <programlisting language="ini">[DEFAULT]
ovs_use_veth = True ovs_use_veth = True
enable_metadata_network = True enable_metadata_network = True
enable_isolated_metadata = True enable_isolated_metadata = True
@ -604,7 +604,7 @@ interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver</programlist
<para>The following DHCP agent options are required in the <para>The following DHCP agent options are required in the
<filename>/etc/neutron/dhcp_agent.ini</filename> file for <filename>/etc/neutron/dhcp_agent.ini</filename> file for
the Ryu plugin:</para> the Ryu plugin:</para>
<programlisting language="bash">[DEFAULT] <programlisting language="ini">[DEFAULT]
ovs_use_veth = True ovs_use_veth = True
use_namespace = True use_namespace = True
interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver</programlisting> interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver</programlisting>

4
doc/install-guide/section_dashboard-install.xml
View File

@ -58,7 +58,7 @@
<filename os="centos;fedora;rhel" <filename os="centos;fedora;rhel"
>/etc/openstack-dashboard/local_settings</filename> >/etc/openstack-dashboard/local_settings</filename>
and look for this line:</para> and look for this line:</para>
<programlisting language="bash" linenumbering="unnumbered"><?db-font-size 75%?>CACHES = { <programlisting language="python" linenumbering="unnumbered"><?db-font-size 75%?>CACHES = {
'default': { 'default': {
'BACKEND' : 'django.core.cache.backends.memcached.MemcachedCache', 'BACKEND' : 'django.core.cache.backends.memcached.MemcachedCache',
'LOCATION' : '127.0.0.1:11211' 'LOCATION' : '127.0.0.1:11211'
@ -114,7 +114,7 @@
os="opensuse" os="opensuse"
>/usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py</filename> >/usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py</filename>
and change <literal>OPENSTACK_HOST</literal> to the hostname of your Identity Service.</para> and change <literal>OPENSTACK_HOST</literal> to the hostname of your Identity Service.</para>
<programlisting language="bash" linenumbering="unnumbered"><?db-font-size 75%?>OPENSTACK_HOST = "controller" <programlisting language="python" linenumbering="unnumbered"><?db-font-size 75%?>OPENSTACK_HOST = "controller"
</programlisting> </programlisting>
</step> </step>
<step os="opensuse"> <step os="opensuse">

14
doc/install-guide/section_networking-provider-router-with-private_networks.xml
View File

@ -114,7 +114,7 @@ rabbit_password = guest</programlisting>
<para>Edit file <filename> <para>Edit file <filename>
/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini</filename> /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini</filename>
and modify:</para> and modify:</para>
<programlisting language="bash">[database] <programlisting language="ini">[database]
sql_connection = mysql://neutron:password@localhost:3306/neutron sql_connection = mysql://neutron:password@localhost:3306/neutron
[ovs] [ovs]
tenant_network_type = vlan tenant_network_type = vlan
@ -124,7 +124,7 @@ network_vlan_ranges = physnet1:100:2999</programlisting>
<para>Edit file <filename> <para>Edit file <filename>
/etc/neutron/api-paste.ini</filename> /etc/neutron/api-paste.ini</filename>
and modify:</para> and modify:</para>
<programlisting language="bash">admin_tenant_name = service <programlisting language="ini">admin_tenant_name = service
admin_user = neutron admin_user = neutron
admin_password = password</programlisting> admin_password = password</programlisting>
</listitem> </listitem>
@ -168,7 +168,7 @@ rabbit_host = controller</programlisting>
<filename> <filename>
/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
</filename>:</para> </filename>:</para>
<programlisting language="bash">[database] <programlisting language="ini">[database]
sql_connection = mysql://neutron:password@192.168.0.1:3306/neutron sql_connection = mysql://neutron:password@192.168.0.1:3306/neutron
[ovs] [ovs]
tenant_network_type=vlan tenant_network_type=vlan
@ -193,7 +193,7 @@ bridge_mappings = physnet1:br-eth1</programlisting>
<para>Edit the file <filename> <para>Edit the file <filename>
/etc/neutron/l3_agent.ini</filename> /etc/neutron/l3_agent.ini</filename>
and modify:</para> and modify:</para>
<programlisting language="bash">[DEFAULT] <programlisting language="ini">[DEFAULT]
auth_url = http://192.168.0.1:35357/v2.0 auth_url = http://192.168.0.1:35357/v2.0
admin_tenant_name = service admin_tenant_name = service
admin_user = neutron admin_user = neutron
@ -205,7 +205,7 @@ use_namespaces = True</programlisting>
<para>Edit the file <filename> <para>Edit the file <filename>
/etc/neutron/api-paste.ini</filename> /etc/neutron/api-paste.ini</filename>
and modify:</para> and modify:</para>
<programlisting language="bash">[DEFAULT] <programlisting language="ini">[DEFAULT]
auth_host = 192.168.0.1 auth_host = 192.168.0.1
admin_tenant_name = service admin_tenant_name = service
admin_user = neutron admin_user = neutron
@ -215,7 +215,7 @@ admin_password = password</programlisting>
<para>Edit the file <filename> <para>Edit the file <filename>
/etc/neutron/dhcp_agent.ini</filename> /etc/neutron/dhcp_agent.ini</filename>
and modify:</para> and modify:</para>
<programlisting language="bash">use_namespaces = True</programlisting> <programlisting language="ini">use_namespaces = True</programlisting>
</step> </step>
<step> <step>
<para>Restart networking services:</para> <para>Restart networking services:</para>
@ -260,7 +260,7 @@ rabbit_host = controller</programlisting>
<step> <step>
<para>Update the file <filename> <para>Update the file <filename>
/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini</filename>:</para> /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini</filename>:</para>
<programlisting language="bash">[database] <programlisting language="ini">[database]
sql_connection = mysql://neutron:password@192.168.0.1:3306/neutron sql_connection = mysql://neutron:password@192.168.0.1:3306/neutron
[ovs] [ovs]
tenant_network_type = vlan tenant_network_type = vlan