openstack/openstack-manuals
Code Issues Proposed changes

Replace "regionOne" with "RegionOne"

Browse Source 
This fixes an inconsistency between the install guide
and other OpenStack components, which names the first region in Camel Case.

Change-Id: I80a1827e9008777e73dce1dd3a95ece5dd614744
Related-Change: I8f47be1b4b43defb86b4da2a34c5f40494361045
This commit is contained in:
Sean M. Collins 2015-04-27 10:25:33 -04:00
parent ac490fc9b1
commit b2ddfaf3d5
17 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/install-guide/section_ceilometer-controller.xml
View File

@ -173,7 +173,7 @@ Repeat User Password:
--publicurl http://<replaceable>controller</replaceable>:8777 \
--internalurl http://<replaceable>controller</replaceable>:8777 \
--adminurl http://<replaceable>controller</replaceable>:8777 \
--region regionOne \
--region RegionOne \
metering</userinput>
<computeroutput>+--------------+----------------------------------+
| Field | Value |
@ -182,7 +182,7 @@ Repeat User Password:
| id | d3716d85b10d4e60a67a52c6af0068cd |
| internalurl | http://controller:8777 |
| publicurl | http://controller:8777 |
| region | regionOne |
| region | RegionOne |
| service_id | 3405453b14da441ebb258edfeba96d83 |
| service_name | ceilometer |
| service_type | metering |
@ -315,7 +315,7 @@ os_username = ceilometer
os_tenant_name = service
os_password = <replaceable>CEILOMETER_PASS</replaceable>
os_endpoint_type = internalURL
os_region_name = regionOne</programlisting>
os_region_name = RegionOne</programlisting>
<para>Replace <replaceable>CEILOMETER_PASS</replaceable> with
the password you chose for the <literal>ceilometer</literal>
user in the Identity service.</para>

2
doc/install-guide/section_ceilometer-nova.xml
View File

@ -75,7 +75,7 @@ os_username = ceilometer
os_tenant_name = service
os_password = <replaceable>CEILOMETER_PASS</replaceable>
os_endpoint_type = internalURL
os_region_name = regionOne</programlisting>
os_region_name = RegionOne</programlisting>
<para>Replace <replaceable>CEILOMETER_PASS</replaceable> with the
password you chose for the <literal>ceilometer</literal> user in
the Identity service.</para>

8
doc/install-guide/section_cinder-controller-node.xml
View File

@ -113,7 +113,7 @@ Repeat User Password:
--publicurl http://<replaceable>controller</replaceable>:8776/v2/%\(tenant_id\)s \
--internalurl http://<replaceable>controller</replaceable>:8776/v2/%\(tenant_id\)s \
--adminurl http://<replaceable>controller</replaceable>:8776/v2/%\(tenant_id\)s \
--region regionOne \
--region RegionOne \
volume</userinput>
<computeroutput>+--------------+-----------------------------------------+
| Field | Value |
@ -122,7 +122,7 @@ Repeat User Password:
| id | d1b7291a2d794e26963b322c7f2a55a4 |
| internalurl | http://controller:8776/v2/%(tenant_id)s |
| publicurl | http://controller:8776/v2/%(tenant_id)s |
| region | regionOne |
| region | RegionOne |
| service_id | 1e494c3e22a24baaafcaf777d4d467eb |
| service_name | cinder |
| service_type | volume |
@ -131,7 +131,7 @@ Repeat User Password:
--publicurl http://<replaceable>controller</replaceable>:8776/v2/%\(tenant_id\)s \
--internalurl http://<replaceable>controller</replaceable>:8776/v2/%\(tenant_id\)s \
--adminurl http://<replaceable>controller</replaceable>:8776/v2/%\(tenant_id\)s \
--region regionOne \
--region RegionOne \
volumev2</userinput>
<computeroutput>+--------------+-----------------------------------------+
| Field | Value |
@ -140,7 +140,7 @@ Repeat User Password:
| id | 097b4a6fc8ba44b4b10d4822d2d9e076 |
| internalurl | http://controller:8776/v2/%(tenant_id)s |
| publicurl | http://controller:8776/v2/%(tenant_id)s |
| region | regionOne |
| region | RegionOne |
| service_id | 16e038e449c94b40868277f1d801edb5 |
| service_name | cinderv2 |
| service_type | volumev2 |

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

@ -104,7 +104,7 @@ Repeat User Password:
--publicurl http://<replaceable>controller</replaceable>:9292 \
--internalurl http://<replaceable>controller</replaceable>:9292 \
--adminurl http://<replaceable>controller</replaceable>:9292 \
--region regionOne \
--region RegionOne \
image</userinput>
<computeroutput>+--------------+----------------------------------+
| Field | Value |
@ -113,7 +113,7 @@ Repeat User Password:
| id | 805b1dbc90ab47479111102bc6423313 |
| internalurl | http://controller:9292 |
| publicurl | http://controller:9292 |
| region | regionOne |
| region | RegionOne |
| service_id | 178124d6081c441b80d79972614149c6 |
| service_name | glance |
| service_type | image |

8
doc/install-guide/section_heat-install.xml
View File

@ -149,7 +149,7 @@ Repeat User Password:
--publicurl http://<replaceable>controller</replaceable>:8004/v1/%\(tenant_id\)s \
--internalurl http://<replaceable>controller</replaceable>:8004/v1/%\(tenant_id\)s \
--adminurl http://<replaceable>controller</replaceable>:8004/v1/%\(tenant_id\)s \
--region regionOne \
--region RegionOne \
orchestration</userinput>
<computeroutput>+--------------+-----------------------------------------+
| Field | Value |
@ -158,7 +158,7 @@ Repeat User Password:
| id | f41225f665694b95a46448e8676b0dc2 |
| internalurl | http://controller:8004/v1/%(tenant_id)s |
| publicurl | http://controller:8004/v1/%(tenant_id)s |
| region | regionOne |
| region | RegionOne |
| service_id | 031112165cad4c2bb23e84603957de29 |
| service_name | heat |
| service_type | orchestration |
@ -167,7 +167,7 @@ Repeat User Password:
--publicurl http://<replaceable>controller</replaceable>:8000/v1 \
--internalurl http://<replaceable>controller</replaceable>:8000/v1 \
--adminurl http://<replaceable>controller</replaceable>:8000/v1 \
--region regionOne \
--region RegionOne \
cloudformation</userinput>
<computeroutput>+--------------+----------------------------------+
| Field | Value |
@ -176,7 +176,7 @@ Repeat User Password:
| id | f41225f665694b95a46448e8676b0dc2 |
| internalurl | http://controller:8000/v1 |
| publicurl | http://controller:8000/v1 |
| region | regionOne |
| region | RegionOne |
| service_id | 297740d74c0a446bbff867acdccb33fa |
| service_name | heat-cfn |
| service_type | cloudformation |

2
doc/install-guide/section_keystone-install.xml
View File

@ -257,7 +257,7 @@ admin_token = <replaceable>ADMIN_TOKEN</replaceable></programlisting>
--publicurl http://<replaceable>controller</replaceable>:5000/v2.0 \
--internalurl http://<replaceable>controller</replaceable>:5000/v2.0 \
--adminurl http://<replaceable>controller</replaceable>:35357/v2.0 \
--region regionOne \
--region RegionOne \
identity</userinput></screen>
<informalfigure>
<mediaobject>

6
doc/install-guide/section_keystone-services.xml
View File

@ -86,14 +86,14 @@
protected, while the internal API network is connected to each host.
Also, OpenStack supports multiple regions for scalability. For
simplicity, this guide uses the management network for all
endpoint variations and the default <literal>regionOne</literal>
endpoint variations and the default <literal>RegionOne</literal>
region.</para>
<para>Create the Identity service API endpoint:</para>
<screen><prompt>$</prompt> <userinput>openstack endpoint create \
--publicurl http://<replaceable>controller</replaceable>:5000/v2.0 \
--internalurl http://<replaceable>controller</replaceable>:5000/v2.0 \
--adminurl http://<replaceable>controller</replaceable>:35357/v2.0 \
--region regionOne \
--region RegionOne \
identity</userinput>
<computeroutput>+--------------+----------------------------------+
| Field | Value |
@ -102,7 +102,7 @@
| id | 4a9ffc04b8eb4848a49625a3df0170e5 |
| internalurl | http://controller:5000/v2.0 |
| publicurl | http://controller:5000/v2.0 |
| region | regionOne |
| region | RegionOne |
| service_id | 4ddaae90388b4ebc9d252ec2252d8d10 |
| service_name | keystone |
| service_type | identity |

6
doc/install-guide/section_neutron-controller-node.xml
View File

@ -93,7 +93,7 @@ Repeat User Password:
--publicurl http://<replaceable>controller</replaceable>:9696 \
--adminurl http://<replaceable>controller</replaceable>:9696 \
--internalurl http://<replaceable>controller</replaceable>:9696 \
--region regionOne \
--region RegionOne \
network</userinput>
<computeroutput>+--------------+----------------------------------+
| Field | Value |
@ -102,7 +102,7 @@ Repeat User Password:
| id | 04a7d3c1de784099aaba83a8a74100b3 |
| internalurl | http://controller:9696 |
| publicurl | http://controller:9696 |
| region | regionOne |
| region | RegionOne |
| service_id | f71529314dab4a4d8eca427e701d209e |
| service_name | neutron |
| service_type | network |
@ -252,7 +252,7 @@ auth_url = http://<replaceable>controller</replaceable>:35357
auth_plugin = password
project_domain_id = default
user_domain_id = default
region_name = regionOne
region_name = RegionOne
project_name = service
username = nova
password = <replaceable>NOVA_PASS</replaceable></programlisting>

2
doc/install-guide/section_neutron-network-node.xml
View File

@ -378,7 +378,7 @@ dnsmasq_config_file = /etc/neutron/dnsmasq-neutron.conf</programlisting>
...
auth_uri = http://<replaceable>controller</replaceable>:5000
auth_url = http://<replaceable>controller</replaceable>:35357
auth_region = regionOne
auth_region = RegionOne
auth_plugin = password
project_domain_id = default
user_domain_id = default

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

@ -96,7 +96,7 @@ Repeat User Password:
--publicurl http://<replaceable>controller</replaceable>:8774/v2/%\(tenant_id\)s \
--internalurl http://<replaceable>controller</replaceable>:8774/v2/%\(tenant_id\)s \
--adminurl http://<replaceable>controller</replaceable>:8774/v2/%\(tenant_id\)s \
--region regionOne \
--region RegionOne \
compute</userinput>
<computeroutput>+--------------+-----------------------------------------+
| Field | Value |
@ -105,7 +105,7 @@ Repeat User Password:
| id | 4e885d4ad43f4c4fbf2287734bc58d6b |
| internalurl | http://controller:8774/v2/%(tenant_id)s |
| publicurl | http://controller:8774/v2/%(tenant_id)s |
| region | regionOne |
| region | RegionOne |
| service_id | 060d59eac51b4594815603d75a00aba2 |
| service_name | nova |
| service_type | compute |

36
doc/install-guide/section_nova-verify.xml
View File

@ -43,8 +43,8 @@
+-----------+------------------------------------------------------------+
| id | 1fb997666b79463fb68db4ccfe4e6a71 |
| interface | public |
| region | regionOne |
| region_id | regionOne |
| region | RegionOne |
| region_id | RegionOne |
| url | http://controller:8774/v2/ae7a98326b9c455588edd2656d723b9d |
+-----------+------------------------------------------------------------+
+-----------+------------------------------------------------------------+
@ -52,8 +52,8 @@
+-----------+------------------------------------------------------------+
| id | bac365db1ff34f08a31d4ae98b056924 |
| interface | admin |
| region | regionOne |
| region_id | regionOne |
| region | RegionOne |
| region_id | RegionOne |
| url | http://controller:8774/v2/ae7a98326b9c455588edd2656d723b9d |
+-----------+------------------------------------------------------------+
+-----------+------------------------------------------------------------+
@ -61,8 +61,8 @@
+-----------+------------------------------------------------------------+
| id | e37186d38b8e4b81a54de34e73b43f34 |
| interface | internal |
| region | regionOne |
| region_id | regionOne |
| region | RegionOne |
| region_id | RegionOne |
| url | http://controller:8774/v2/ae7a98326b9c455588edd2656d723b9d |
+-----------+------------------------------------------------------------+
@ -71,8 +71,8 @@
+-----------+----------------------------------+
| id | 41ad39f6c6444b7d8fd8318c18ae0043 |
| interface | admin |
| region | regionOne |
| region_id | regionOne |
| region | RegionOne |
| region_id | RegionOne |
| url | http://controller:9292 |
+-----------+----------------------------------+
+-----------+----------------------------------+
@ -80,8 +80,8 @@
+-----------+----------------------------------+
| id | 50ecc4ce62724e319f4fae3861e50f7d |
| interface | internal |
| region | regionOne |
| region_id | regionOne |
| region | RegionOne |
| region_id | RegionOne |
| url | http://controller:9292 |
+-----------+----------------------------------+
+-----------+----------------------------------+
@ -89,8 +89,8 @@
+-----------+----------------------------------+
| id | 7d3df077a20b4461a372269f603b7516 |
| interface | public |
| region | regionOne |
| region_id | regionOne |
| region | RegionOne |
| region_id | RegionOne |
| url | http://controller:9292 |
+-----------+----------------------------------+
@ -99,8 +99,8 @@
+-----------+----------------------------------+
| id | 88150c2fdc9d406c9b25113701248192 |
| interface | internal |
| region | regionOne |
| region_id | regionOne |
| region | RegionOne |
| region_id | RegionOne |
| url | http://controller:5000/v2.0 |
+-----------+----------------------------------+
+-----------+----------------------------------+
@ -108,8 +108,8 @@
+-----------+----------------------------------+
| id | cecab58c0f024d95b36a4ffa3e8d81e1 |
| interface | public |
| region | regionOne |
| region_id | regionOne |
| region | RegionOne |
| region_id | RegionOne |
| url | http://controller:5000/v2.0 |
+-----------+----------------------------------+
+-----------+----------------------------------+
@ -117,8 +117,8 @@
+-----------+----------------------------------+
| id | fc90391ae7cd4216aca070042654e424 |
| interface | admin |
| region | regionOne |
| region_id | regionOne |
| region | RegionOne |
| region_id | RegionOne |
| url | http://controller:35357/v2.0 |
+-----------+----------------------------------+</computeroutput></screen>
</step>

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

@ -182,7 +182,7 @@ Repeat User Password:
--publicurl http://<replaceable>controller</replaceable>:8386/v1.1/%\(tenant_id\)s \
--internalurl http://<replaceable>controller</replaceable>:8386/v1.1/%\(tenant_id\)s \
--adminurl http://<replaceable>controller</replaceable>:8386/v1.1/%\(tenant_id\)s \
--region regionOne \
--region RegionOne \
data_processing</userinput>
<computeroutput>+--------------+-------------------------------------------+
| Field | Value |
@ -191,7 +191,7 @@ Repeat User Password:
| id | dbb754f069c949e19fc40171112bfc01 |
| internalurl | http://controller:8386/v1.1/%(tenant_id)s |
| publicurl | http://controller:8386/v1.1/%(tenant_id)s |
| region | regionOne |
| region | RegionOne |
| service_id | 6e867d0a062e4c1fb1c335b74ab7a8f4 |
| service_name | sahara |
| service_type | data_processing |

4
doc/install-guide/section_swift-controller-node.xml
View File

@ -81,7 +81,7 @@ Repeat User Password:
--publicurl 'http://<replaceable>controller</replaceable>:8080/v1/AUTH_%(tenant_id)s' \
--internalurl 'http://<replaceable>controller</replaceable>:8080/v1/AUTH_%(tenant_id)s' \
--adminurl http://<replaceable>controller</replaceable>:8080 \
--region regionOne \
--region RegionOne \
object-store</userinput>
<computeroutput>+--------------+----------------------------------------------+
| Field | Value |
@ -90,7 +90,7 @@ Repeat User Password:
| id | af534fb8b7ff40a6acf725437c586ebe |
| internalurl | http://controller:8080/v1/AUTH_%(tenant_id)s |
| publicurl | http://controller:8080/v1/AUTH_%(tenant_id)s |
| region | regionOne |
| region | RegionOne |
| service_id | 75ef509da2c340499d454ae96a2c5c34 |
| service_name | swift |
| service_type | object-store |

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

@ -243,7 +243,7 @@ Repeat User Password:
--publicurl http://<replaceable>controller</replaceable>:8779/v1.0/%\(tenant_id\)s \
--internalurl http://<replaceable>controller</replaceable>:8779/v1.0/%\(tenant_id\)s \
--adminurl http://<replaceable>controller</replaceable>:8779/v1.0/%\(tenant_id\)s \
--region regionOne \
--region RegionOne \
database</userinput>
<computeroutput>+--------------+-------------------------------------------+
| Field | Value |
@ -252,7 +252,7 @@ Repeat User Password:
| id | 22db3a4e1ce1407f80dfc1fbe6c26278 |
| internalurl | http://controller:8779/v1.0/%(tenant_id)s |
| publicurl | http://controller:8779/v1.0/%(tenant_id)s |
| region | regionOne |
| region | RegionOne |
| service_id | 390a039be169460c994110210c620d2f |
| service_name | trove |
| service_type | database |

4
doc/networking-guide/source/deploy_scenario1a.rst
View File

@ -612,7 +612,7 @@ other nodes.
notify_nova_on_port_status_changes = True
notify_nova_on_port_data_changes = True
nova_url = http://controller:8774/v2
nova_region_name = regionOne
nova_region_name = RegionOne
nova_admin_username = NOVA_ADMIN_USERNAME
nova_admin_tenant_id = NOVA_ADMIN_TENANT_ID
nova_admin_password = NOVA_ADMIN_PASSWORD
@ -781,7 +781,7 @@ The network node provides DHCP and NAT services to all instances.
[DEFAULT]
verbose = True
auth_url = http://controller:5000/v2.0
auth_region = regionOne
auth_region = RegionOne
admin_tenant_name = ADMIN_TENANT_NAME
admin_user = ADMIN_USER
admin_password = ADMIN_PASSWORD

4
doc/networking-guide/source/deploy_scenario1b.rst
View File

@ -578,7 +578,7 @@ other nodes.
notify_nova_on_port_status_changes = True
notify_nova_on_port_data_changes = True
nova_url = http://controller:8774/v2
nova_region_name = regionOne
nova_region_name = RegionOne
nova_admin_username = NOVA_ADMIN_USERNAME
nova_admin_tenant_id = NOVA_ADMIN_TENANT_ID
nova_admin_password = NOVA_ADMIN_PASSWORD
@ -746,7 +746,7 @@ The network node provides DHCP and NAT services to all instances.
[DEFAULT]
verbose = True
auth_url = http://controller:5000/v2.0
auth_region = regionOne
auth_region = RegionOne
admin_tenant_name = ADMIN_TENANT_NAME
admin_user = ADMIN_USER
admin_password = ADMIN_PASSWORD

2
doc/networking-guide/source/deploy_scenario4a.rst
View File

@ -230,7 +230,7 @@ Controller node (controller)
notify_nova_on_port_status_changes = True
notify_nova_on_port_data_changes = True
nova_url = http://controller:8774/v2
nova_region_name = regionOne
nova_region_name = RegionOne
nova_admin_username = NOVA_ADMIN_USERNAME
nova_admin_tenant_id = NOVA_ADMIN_TENANT_ID
nova_admin_password = NOVA_ADMIN_PASSWORD