Change-Id: I78ac040e926ef8040ee674b6fea3223a8ab4ae99
tanlin authored on 2014/02/12 17:11:32... | ... |
@@ -67,7 +67,7 @@ GLANCE_HOST=${GLANCE_HOST:-$HOST_IP} |
67 | 67 |
# Identity API version |
68 | 68 |
export OS_IDENTITY_API_VERSION=${IDENTITY_API_VERSION:-2.0} |
69 | 69 |
|
70 |
-# Authenticating against an Openstack cloud using Keystone returns a **Token** |
|
70 |
+# Authenticating against an OpenStack cloud using Keystone returns a **Token** |
|
71 | 71 |
# and **Service Catalog**. The catalog contains the endpoints for all services |
72 | 72 |
# the user/tenant has access to - including nova, glance, keystone, swift, ... |
73 | 73 |
# We currently recommend using the 2.0 *identity api*. |
... | ... |
@@ -199,7 +199,7 @@ export EC2_URL="$EC2_URL" |
199 | 199 |
export S3_URL="$S3_URL" |
200 | 200 |
# OpenStack USER ID = $user_id |
201 | 201 |
export OS_USERNAME="$user_name" |
202 |
-# Openstack Tenant ID = $tenant_id |
|
202 |
+# OpenStack Tenant ID = $tenant_id |
|
203 | 203 |
export OS_TENANT_NAME="$tenant_name" |
204 | 204 |
export OS_AUTH_URL="$OS_AUTH_URL" |
205 | 205 |
export OS_CACERT="$OS_CACERT" |
... | ... |
@@ -1,6 +1,6 @@ |
1 | 1 |
Getting Started With Jenkins and Devstack |
2 | 2 |
========================================= |
3 |
-This little corner of devstack is to show how to get an Openstack jenkins |
|
3 |
+This little corner of devstack is to show how to get an OpenStack jenkins |
|
4 | 4 |
environment up and running quickly, using the rcb configuration methodology. |
5 | 5 |
|
6 | 6 |
|
... | ... |
@@ -1,11 +1,11 @@ |
1 | 1 |
# Getting Started With XenServer and Devstack |
2 | 2 |
|
3 | 3 |
The purpose of the code in this directory it to help developers bootstrap a |
4 |
-XenServer 6.2 (older versions may also work) + Openstack development |
|
4 |
+XenServer 6.2 (older versions may also work) + OpenStack development |
|
5 | 5 |
environment. This file gives some pointers on how to get started. |
6 | 6 |
|
7 | 7 |
Xenserver is a Type 1 hypervisor, so it is best installed on bare metal. The |
8 |
-Openstack services are configured to run within a virtual machine (called OS |
|
8 |
+OpenStack services are configured to run within a virtual machine (called OS |
|
9 | 9 |
domU) on the XenServer host. The VM uses the XAPI toolstack to communicate with |
10 | 10 |
the host over a network connection (see `MGT_BRIDGE_OR_NET_NAME`). |
11 | 11 |
|