openstack/heat
Code Issues Proposed changes

Rename Openstack to OpenStack

Browse Source 
Change-Id: I11902f8b76283463ecd5203156c35f5c2e90fd1f
This commit is contained in:
tanlin
2014-02-13 15:11:31 +08:00
parent e17a02c035
commit 521aaa5115
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/rackspace/README.md
View File

@@ -1,7 +1,7 @@
# Heat resources for working with the Rackspace Cloud # Heat resources for working with the Rackspace Cloud
The resources and configuration in this module are for using Heat with the Rackspace Cloud. These resources either The resources and configuration in this module are for using Heat with the Rackspace Cloud. These resources either
allow using Rackspace services that don't have equivalent services in Openstack or account for differences between allow using Rackspace services that don't have equivalent services in OpenStack or account for differences between
a generic Openstack deployment and Rackspace Cloud. a generic OpenStack deployment and Rackspace Cloud.
## Resources ## Resources
The following resources are provided for compatibility: The following resources are provided for compatibility:
@@ -16,4 +16,4 @@ The following resources are provided for compatibility:
## Usage ## Usage
### Templates ### Templates
### Configuration ### Configuration

10
doc/source/getting_started/standalone.rst
View File

@@ -11,20 +11,20 @@
License for the specific language governing permissions and limitations License for the specific language governing permissions and limitations
under the License. under the License.
How to get Heat to work with a remote Openstack. How to get Heat to work with a remote OpenStack.
================================================ ================================================
Say you have a remote/public install of Openstack and you want to use Say you have a remote/public install of OpenStack and you want to use
a local install of Heat to talk to it. This can be handy when a local install of Heat to talk to it. This can be handy when
developing, as the remote Openstack can be kept stable and is not developing, as the remote OpenStack can be kept stable and is not
effected by changes made to the development machine. effected by changes made to the development machine.
So lets say you have 2 machines: So lets say you have 2 machines:
* “rock” ip == 192.168.1.88 (used for base Openstack services) * “rock” ip == 192.168.1.88 (used for base OpenStack services)
* “hack” ip == 192.168.1.77 (used for Heat development) * “hack” ip == 192.168.1.77 (used for Heat development)
Install your Openstack as normal on “rock”. Install your OpenStack as normal on “rock”.
In this example "hack" is used as the devstack to install Heat on. In this example "hack" is used as the devstack to install Heat on.
The localrc looked like this:: The localrc looked like this::

4
doc/source/glossary.rst
View File

@@ -101,9 +101,9 @@
A :term:`resource` implemented by a :term:`provider A :term:`resource` implemented by a :term:`provider
template`. The parent resource's properties become the template`. The parent resource's properties become the
:term:`nested stack's <nested stack>` parameters. See `What are :term:`nested stack's <nested stack>` parameters. See `What are
"Providers"? (Openstack Wiki)`_. "Providers"? (OpenStack Wiki)`_.
.. _`What are "Providers"? (Openstack Wiki)`: https://wiki.openstack.org/wiki/Heat/Providers#What_are_.22Providers.22.3F .. _`What are "Providers"? (OpenStack Wiki)`: https://wiki.openstack.org/wiki/Heat/Providers#What_are_.22Providers.22.3F
Provider template Provider template
Allows user-definable :term:`resource providers <resource Allows user-definable :term:`resource providers <resource

2
doc/source/scale_deployment.rst
View File

@@ -29,7 +29,7 @@ respectively.
Assumptions Assumptions
=========== ===========
This guide, using a devstack installation of Openstack, assumes that: This guide, using a devstack installation of OpenStack, assumes that:
1. You have configured devstack from `Single Machine Installation Guide 1. You have configured devstack from `Single Machine Installation Guide
<http://devstack.org/guides/single-machine.html>`_; <http://devstack.org/guides/single-machine.html>`_;

2
heat/common/wsgi.py
View File

@@ -467,7 +467,7 @@ class Router(object):
class Request(webob.Request): class Request(webob.Request):
"""Add some Openstack API-specific logic to the base webob.Request.""" """Add some OpenStack API-specific logic to the base webob.Request."""
def best_match_content_type(self): def best_match_content_type(self):
"""Determine the requested response content-type.""" """Determine the requested response content-type."""

2
heat/engine/resources/nova_utils.py
View File

@@ -12,7 +12,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
"""Utilities for Resources that use the Openstack Nova API.""" """Utilities for Resources that use the OpenStack Nova API."""
from email.mime.multipart import MIMEMultipart from email.mime.multipart import MIMEMultipart
from email.mime.text import MIMEText from email.mime.text import MIMEText

2
heat/engine/resources/os_database.py
View File

@@ -33,7 +33,7 @@ logger = logging.getLogger(__name__)
class OSDBInstance(resource.Resource): class OSDBInstance(resource.Resource):
''' '''
Openstack cloud database instance resource. OpenStack cloud database instance resource.
''' '''
PROPERTIES = ( PROPERTIES = (