From 92b1fc2b37c535b0783562404be6785562605ad9 Mon Sep 17 00:00:00 2001 From: venkatamahesh Date: Thu, 4 Feb 2016 15:33:45 +0530 Subject: [PATCH] Use uppercase 'S' in OpenStack Change-Id: I9cf21e65045f07a2b0ca3e6cdd6afcf54bbfc589 --- .../example-app/io.murano.apps.demo.DemoApp/UI/ui.yaml | 2 +- doc/source/articles/ad-ui.rst | 2 +- doc/source/articles/telnet.rst | 2 +- doc/source/draft/appdev-guide/muranopackages/dynamic_ui.rst | 4 ++-- doc/source/draft/appdev-guide/step_by_step.rst | 3 ++- doc/source/draft/appdev-guide/use_cases.rst | 2 +- doc/source/specification/murano-repository.rst | 4 ++-- murano/common/wsgi.py | 2 +- murano/db/models.py | 2 +- murano/tests/functional/integration/integration_base.py | 2 +- 10 files changed, 13 insertions(+), 12 deletions(-) diff --git a/contrib/plugins/murano_exampleplugin/example-app/io.murano.apps.demo.DemoApp/UI/ui.yaml b/contrib/plugins/murano_exampleplugin/example-app/io.murano.apps.demo.DemoApp/UI/ui.yaml index e7691cbe..36acf6da 100644 --- a/contrib/plugins/murano_exampleplugin/example-app/io.murano.apps.demo.DemoApp/UI/ui.yaml +++ b/contrib/plugins/murano_exampleplugin/example-app/io.murano.apps.demo.DemoApp/UI/ui.yaml @@ -50,7 +50,7 @@ Forms: type: flavor label: Instance flavor description: >- - Select registered in Openstack flavor. Consider that application performance + Select registered in OpenStack flavor. Consider that application performance depends on this parameter. required: false - name: osImage diff --git a/doc/source/articles/ad-ui.rst b/doc/source/articles/ad-ui.rst index 43625627..5e403309 100644 --- a/doc/source/articles/ad-ui.rst +++ b/doc/source/articles/ad-ui.rst @@ -172,7 +172,7 @@ UI Definition Of Active Directory Application type: flavor label: Instance flavor description: >- - Select registered in Openstack flavor. Consider that service performance + Select registered in OpenStack flavor. Consider that service performance depends on this parameter. required: false - name: osImage diff --git a/doc/source/articles/telnet.rst b/doc/source/articles/telnet.rst index 26c36762..19cd0d58 100644 --- a/doc/source/articles/telnet.rst +++ b/doc/source/articles/telnet.rst @@ -102,7 +102,7 @@ UI Definition of telnet application type: flavor label: Instance flavor description: >- - Select registered in Openstack flavor. Consider that application performance + Select registered in OpenStack flavor. Consider that application performance depends on this parameter. required: false - name: osImage diff --git a/doc/source/draft/appdev-guide/muranopackages/dynamic_ui.rst b/doc/source/draft/appdev-guide/muranopackages/dynamic_ui.rst index 58565055..4617eb31 100644 --- a/doc/source/draft/appdev-guide/muranopackages/dynamic_ui.rst +++ b/doc/source/draft/appdev-guide/muranopackages/dynamic_ui.rst @@ -58,7 +58,7 @@ Version history ~~~~~~~~~~~~~~~ +---------+-------------------------------------------------------------------+-------------------+ -| Version | Changes | Openstack Version | +| Version | Changes | OpenStack Version | +=========+===================================================================+===================+ | 1.0 | - Initial Dymanic UI implementation | Icehouse | +---------+-------------------------------------------------------------------+-------------------+ @@ -351,7 +351,7 @@ fields. type: flavor label: Instance flavor description: >- - Select a flavor registered in Openstack. Consider that service performance + Select a flavor registered in OpenStack. Consider that service performance depends on this parameter. required: false - name: osImage diff --git a/doc/source/draft/appdev-guide/step_by_step.rst b/doc/source/draft/appdev-guide/step_by_step.rst index aa18d6e7..88a560de 100644 --- a/doc/source/draft/appdev-guide/step_by_step.rst +++ b/doc/source/draft/appdev-guide/step_by_step.rst @@ -139,9 +139,10 @@ stands for the "class" part of the name: FullName: io.murano.apps.apache.ApacheHttpServer .. note:: + It is not necessary that all applications belong to one domain. This naming allows to determine an application group by its name. - Openstack-related applications may have full names, started with + OpenStack-related applications may have full names, started with ``org.openstack.apps``, for example, ``org.openstack.apps.Rally`` diff --git a/doc/source/draft/appdev-guide/use_cases.rst b/doc/source/draft/appdev-guide/use_cases.rst index b75f839e..6d9aa595 100644 --- a/doc/source/draft/appdev-guide/use_cases.rst +++ b/doc/source/draft/appdev-guide/use_cases.rst @@ -126,7 +126,7 @@ services, that have an API. External load-balancer ---------------------- Suppose, you have powerful load-balancer on a real server. And you want to run -the application on an Openstack VM. Murano can set up new applications to be managed +the application on an OpenStack VM. Murano can set up new applications to be managed by that external load-balancer (LB). Let’s go into more details. To implement this case the following apps are used: diff --git a/doc/source/specification/murano-repository.rst b/doc/source/specification/murano-repository.rst index 170fee13..df9334d8 100644 --- a/doc/source/specification/murano-repository.rst +++ b/doc/source/specification/murano-repository.rst @@ -96,7 +96,7 @@ For an admin role all packages are available. "name": "Telnet", "type": "linux", "description": "Installs Telnet service", - "author": "Openstack, Inc.", + "author": "OpenStack, Inc.", "created": "2014-04-02T14:31:55", "enabled": true, "tags": ["linux", "telnet"], @@ -110,7 +110,7 @@ For an admin role all packages are available. "name": "Internet Information Services", "type": "windows", "description": "The Internet Information Service sets up an IIS server and joins it into an existing domain", - "author": "Openstack, Inc.", + "author": "OpenStack, Inc.", "created": "2014-04-02T14:31:55", "enabled": true, "tags": ["windows", "web"], diff --git a/murano/common/wsgi.py b/murano/common/wsgi.py index 9cae0233..4bf8f14c 100644 --- a/murano/common/wsgi.py +++ b/murano/common/wsgi.py @@ -291,7 +291,7 @@ class Router(object): 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.""" default_request_content_types = ('application/json', 'application/xml', diff --git a/murano/db/models.py b/murano/db/models.py index 1bda42ac..73b4ffbf 100644 --- a/murano/db/models.py +++ b/murano/db/models.py @@ -239,7 +239,7 @@ class Package(Base, TimestampMixin): fully_qualified_name = sa.Column(sa.String(128), nullable=False) type = sa.Column(sa.String(20), nullable=False, default='class') - author = sa.Column(sa.String(80), default='Openstack') + author = sa.Column(sa.String(80), default='OpenStack') supplier = sa.Column(st.JsonBlob(), nullable=True, default={}) name = sa.Column(sa.String(80), nullable=False) enabled = sa.Column(sa.Boolean, default=True) diff --git a/murano/tests/functional/integration/integration_base.py b/murano/tests/functional/integration/integration_base.py index 101fb79f..ffba8758 100644 --- a/murano/tests/functional/integration/integration_base.py +++ b/murano/tests/functional/integration/integration_base.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015 Openstack Foundation, Inc. +# Copyright (c) 2015 OpenStack Foundation, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain