Merge "Update namespaces for applications" into stable/kilo

This commit is contained in:
Jenkins 2016-07-19 16:11:22 +00:00 committed by Gerrit Code Review
commit 429b98a0bc
33 changed files with 55 additions and 55 deletions

View File

@ -11,7 +11,7 @@
# under the License. # under the License.
Namespaces: Namespaces:
=: io.murano.apps.apache =: com.example.apache
std: io.murano std: io.murano
res: io.murano.resources res: io.murano.resources
sys: io.murano.system sys: io.murano.system

View File

@ -14,7 +14,7 @@ Version: 2
Application: Application:
?: ?:
type: io.murano.apps.apache.ApacheHttpServer type: com.example.apache.ApacheHttpServer
name: $.appConfiguration.name name: $.appConfiguration.name
enablePHP: $.appConfiguration.enablePHP enablePHP: $.appConfiguration.enablePHP
instance: instance:

View File

@ -12,7 +12,7 @@
Format: 1.0 Format: 1.0
Type: Application Type: Application
FullName: io.murano.apps.apache.ApacheHttpServer FullName: com.example.apache.ApacheHttpServer
Name: Apache HTTP Server Name: Apache HTTP Server
Description: | Description: |
The Apache HTTP Server Project is an effort to develop and maintain an The Apache HTTP Server Project is an effort to develop and maintain an
@ -25,4 +25,4 @@ Description: |
Author: 'Mirantis, Inc' Author: 'Mirantis, Inc'
Tags: [HTTP, Server, WebServer, HTML, Apache] Tags: [HTTP, Server, WebServer, HTML, Apache]
Classes: Classes:
io.murano.apps.apache.ApacheHttpServer: ApacheHttpServer.yaml com.example.apache.ApacheHttpServer: ApacheHttpServer.yaml

View File

@ -11,7 +11,7 @@
# under the License. # under the License.
Namespaces: Namespaces:
=: io.murano.apps.paas =: com.example.paas
std: io.murano std: io.murano
res: io.murano.resources res: io.murano.resources
sys: io.murano.system sys: io.murano.system

View File

@ -14,7 +14,7 @@ Version: 2
Application: Application:
?: ?:
type: io.murano.apps.paas.CloudFoundry type: com.example.paas.CloudFoundry
name: $.appConfiguration.name name: $.appConfiguration.name
instance: instance:
?: ?:

View File

@ -12,11 +12,11 @@
Format: 1.0 Format: 1.0
Type: Application Type: Application
FullName: io.murano.apps.paas.CloudFoundry FullName: com.example.paas.CloudFoundry
Name: Cloud Foundry Name: Cloud Foundry
Description: | Description: |
Cloud Foundry is an opensource PaaS solution. PaaS makes platform much easier to deploy, run and scale applications. Some PaaS offerings have limited language and framework support, do not deliver key application services, or restrict deployment to a single cloud. Cloud Foundry is the industrys Open PaaS and provides a choice of clouds, frameworks and application services. As an open source project, there is a broad community both contributing and supporting Cloud Foundry. Cloud Foundry is an opensource PaaS solution. PaaS makes platform much easier to deploy, run and scale applications. Some PaaS offerings have limited language and framework support, do not deliver key application services, or restrict deployment to a single cloud. Cloud Foundry is the industrys Open PaaS and provides a choice of clouds, frameworks and application services. As an open source project, there is a broad community both contributing and supporting Cloud Foundry.
Author: 'Mirantis, Inc' Author: 'Mirantis, Inc'
Tags: ['PAAS'] Tags: ['PAAS']
Classes: Classes:
io.murano.apps.paas.CloudFoundry: CloudFoundry.yaml com.example.paas.CloudFoundry: CloudFoundry.yaml

View File

@ -11,7 +11,7 @@
# under the License. # under the License.
Namespaces: Namespaces:
=: io.murano.conflang.test.ChefExample =: com.example.conflang.test.ChefExample
std: io.murano std: io.murano
res: io.murano.resources res: io.murano.resources
sys: io.murano.system sys: io.murano.system

View File

@ -12,11 +12,11 @@
Format: 1.0 Format: 1.0
Type: Application Type: Application
FullName: io.murano.conflang.test.ChefExample FullName: com.example.conflang.test.ChefExample
Name: ChefExample Name: ChefExample
Description: | Description: |
Chef Test. Chef Test.
Author: 'TID' Author: 'TID'
Tags: [Test, Chef] Tags: [Test, Chef]
Classes: Classes:
io.murano.conflang.test.ChefExample: ChefExample.yaml com.example.conflang.test.ChefExample: ChefExample.yaml

View File

@ -11,7 +11,7 @@
# under the License. # under the License.
Namespaces: Namespaces:
=: io.murano.conflang.test.PuppetExample =: com.example.conflang.test.PuppetExample
std: io.murano std: io.murano
res: io.murano.resources res: io.murano.resources
sys: io.murano.system sys: io.murano.system

View File

@ -12,11 +12,11 @@
Format: 1.0 Format: 1.0
Type: Application Type: Application
FullName: io.murano.conflang.test.PuppetExample FullName: com.example.conflang.test.PuppetExample
Name: PuppetExample Name: PuppetExample
Description: | Description: |
Puppet Test. Puppet Test.
Author: 'TID' Author: 'TID'
Tags: [Test, Puppet] Tags: [Test, Puppet]
Classes: Classes:
io.murano.conflang.test.PuppetExample: PuppetExample.yaml com.example.conflang.test.PuppetExample: PuppetExample.yaml

View File

@ -11,7 +11,7 @@
# under the License. # under the License.
Namespaces: Namespaces:
=: io.murano.databases =: com.example.databases
std: io.murano std: io.murano
res: io.murano.resources res: io.murano.resources
sys: io.murano.system sys: io.murano.system

View File

@ -14,7 +14,7 @@ Version: 2
Application: Application:
?: ?:
type: io.murano.databases.MySql type: com.example.databases.MySql
name: $.appConfiguration.name name: $.appConfiguration.name
database: $.initDatabaseConfiguration.database database: $.initDatabaseConfiguration.database
username: $.initDatabaseConfiguration.username username: $.initDatabaseConfiguration.username

View File

@ -12,7 +12,7 @@
Format: 1.0 Format: 1.0
Type: Application Type: Application
FullName: io.murano.databases.MySql FullName: com.example.databases.MySql
Name: MySQL Name: MySQL
Description: | Description: |
MySql is a relational database management system (RDBMS), and ships with MySql is a relational database management system (RDBMS), and ships with
@ -21,6 +21,6 @@ Description: |
Author: 'Mirantis, Inc' Author: 'Mirantis, Inc'
Tags: [Database, MySql, SQL, RDBMS] Tags: [Database, MySql, SQL, RDBMS]
Classes: Classes:
io.murano.databases.MySql: MySql.yaml com.example.databases.MySql: MySql.yaml
Require: Require:
io.murano.databases: com.example.databases:

View File

@ -11,7 +11,7 @@
# under the License. # under the License.
Namespaces: Namespaces:
=: io.murano.apps.pivotal =: com.example.pivotal
std: io.murano std: io.murano
res: io.murano.resources res: io.murano.resources
sys: io.murano.system sys: io.murano.system

View File

@ -14,7 +14,7 @@ Version: 2
Application: Application:
?: ?:
type: io.murano.apps.pivotal.OpsManager type: com.example.pivotal.OpsManager
name: $.appConfiguration.name name: $.appConfiguration.name
username: $.opsManagerConfiguration.username username: $.opsManagerConfiguration.username
password: $.opsManagerConfiguration.password password: $.opsManagerConfiguration.password
@ -24,7 +24,7 @@ Application:
sshKey: $.opsManagerConfiguration.sshKey sshKey: $.opsManagerConfiguration.sshKey
instance: instance:
?: ?:
type: io.murano.apps.pivotal.OpsManagerInstance type: com.example.pivotal.OpsManagerInstance
name: generateHostname($.instanceConfiguration.unitNamingPattern, 1) name: generateHostname($.instanceConfiguration.unitNamingPattern, 1)
flavor: $.instanceConfiguration.flavor flavor: $.instanceConfiguration.flavor
image: 'Ops Manager' image: 'Ops Manager'

View File

@ -12,12 +12,12 @@
Format: 1.0 Format: 1.0
Type: Application Type: Application
FullName: io.murano.apps.pivotal.OpsManager FullName: com.example.pivotal.OpsManager
Name: Pivotal Operations Manager Name: Pivotal Operations Manager
Description: | Description: |
Operations Manager is a web application that you use to deploy and manage a Pivotal Cloud Foundry. Operations Manager is a web application that you use to deploy and manage a Pivotal Cloud Foundry.
Author: 'Mirantis, Inc' Author: 'Mirantis, Inc'
Tags: [PAAS, Cloud Foundry] Tags: [PAAS, Cloud Foundry]
Classes: Classes:
io.murano.apps.pivotal.OpsManager: OpsManager.yaml com.example.pivotal.OpsManager: OpsManager.yaml
io.murano.apps.pivotal.OpsManagerInstance: OpsManagerInstance.yaml com.example.pivotal.OpsManagerInstance: OpsManagerInstance.yaml

View File

@ -11,7 +11,7 @@
# under the License. # under the License.
Namespaces: Namespaces:
=: io.murano.databases =: com.example.databases
std: io.murano std: io.murano
res: io.murano.resources res: io.murano.resources
sys: io.murano.system sys: io.murano.system

View File

@ -14,7 +14,7 @@ Version: 2
Application: Application:
?: ?:
type: io.murano.databases.PostgreSql type: com.example.databases.PostgreSql
name: $.appConfiguration.name name: $.appConfiguration.name
database: $.initDatabaseConfiguration.database database: $.initDatabaseConfiguration.database
username: $.initDatabaseConfiguration.username username: $.initDatabaseConfiguration.username

View File

@ -12,7 +12,7 @@
Format: 1.0 Format: 1.0
Type: Application Type: Application
FullName: io.murano.databases.PostgreSql FullName: com.example.databases.PostgreSql
Name: PostgreSQL Name: PostgreSQL
Description: | Description: |
PostgreSQL is a powerful, open source object-relational database system. PostgreSQL is a powerful, open source object-relational database system.
@ -22,6 +22,6 @@ Description: |
Author: 'Mirantis, Inc' Author: 'Mirantis, Inc'
Tags: [Database, Postgre, SQL, RDBMS] Tags: [Database, Postgre, SQL, RDBMS]
Classes: Classes:
io.murano.databases.PostgreSql: PostgreSql.yaml com.example.databases.PostgreSql: PostgreSql.yaml
Require: Require:
io.murano.databases: com.example.databases:

View File

@ -11,7 +11,7 @@
# under the License. # under the License.
Namespaces: Namespaces:
=: io.murano.databases =: com.example.databases
std: io.murano std: io.murano
Name: SqlDatabase Name: SqlDatabase

View File

@ -12,11 +12,11 @@
Format: 1.0 Format: 1.0
Type: Library Type: Library
FullName: io.murano.databases FullName: com.example.databases
Name: SQL Library Name: SQL Library
Description: | Description: |
This is the interface defining API for different SQL - RDBMS databases This is the interface defining API for different SQL - RDBMS databases
Author: 'Mirantis, Inc' Author: 'Mirantis, Inc'
Tags: [SQL, RDBMS] Tags: [SQL, RDBMS]
Classes: Classes:
io.murano.databases.SqlDatabase: SqlDatabase.yaml com.example.databases.SqlDatabase: SqlDatabase.yaml

View File

@ -11,7 +11,7 @@
# under the License. # under the License.
Namespaces: Namespaces:
=: io.murano.apps.apache =: com.example.apache
std: io.murano std: io.murano
res: io.murano.resources res: io.murano.resources
sys: io.murano.system sys: io.murano.system

View File

@ -14,7 +14,7 @@ Version: 2
Application: Application:
?: ?:
type: io.murano.apps.apache.Tomcat type: com.example.apache.Tomcat
name: $.appConfiguration.name name: $.appConfiguration.name
instance: instance:
?: ?:

View File

@ -12,11 +12,11 @@
Format: 1.0 Format: 1.0
Type: Application Type: Application
FullName: io.murano.apps.apache.Tomcat FullName: com.example.apache.Tomcat
Name: Apache Tomcat Name: Apache Tomcat
Description: | Description: |
Apache Tomcat is an open source software implementation of the Java Servlet and JavaServer Pages technologies. Apache Tomcat is an open source software implementation of the Java Servlet and JavaServer Pages technologies.
Author: 'Mirantis, Inc' Author: 'Mirantis, Inc'
Tags: [Servlets, Server, Pages, Java] Tags: [Servlets, Server, Pages, Java]
Classes: Classes:
io.murano.apps.apache.Tomcat: Tomcat.yaml com.example.apache.Tomcat: Tomcat.yaml

View File

@ -11,11 +11,11 @@
# under the License. # under the License.
Namespaces: Namespaces:
=: io.murano.apps =: com.example
std: io.murano std: io.murano
sys: io.murano.system sys: io.murano.system
db: io.murano.databases db: com.example.databases
srv: io.murano.apps.apache srv: com.example.apache
Name: WordPress Name: WordPress

View File

@ -14,7 +14,7 @@ Version: 2
Application: Application:
?: ?:
type: io.murano.apps.WordPress type: com.example.WordPress
name: $.appConfiguration.name name: $.appConfiguration.name
database: $.appConfiguration.database database: $.appConfiguration.database
server: $.appConfiguration.server server: $.appConfiguration.server
@ -40,17 +40,17 @@ Forms:
Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and
underline are allowed underline are allowed
- name: database - name: database
type: io.murano.databases.MySql type: com.example.databases.MySql
label: Database Server label: Database Server
description: >- description: >-
Select a database server to host the application`s database Select a database server to host the application`s database
- name: server - name: server
type: io.murano.apps.apache.ApacheHttpServer type: com.example.apache.ApacheHttpServer
label: HTTP Server label: HTTP Server
description: >- description: >-
Select an instance of Apache HTTP Server to run the app Select an instance of Apache HTTP Server to run the app
- name: zabbix - name: zabbix
type: io.murano.apps.ZabbixAgent type: com.example.ZabbixAgent
label: Monitoring label: Monitoring
required: false required: false
description: >- description: >-

View File

@ -12,11 +12,11 @@
Format: 1.0 Format: 1.0
Type: Application Type: Application
FullName: io.murano.apps.WordPress FullName: com.example.WordPress
Name: WordPress Name: WordPress
Description: | Description: |
WordPress is a free and open source blogging tool and a content management system (CMS) based on PHP and MySQL. WordPress is a free and open source blogging tool and a content management system (CMS) based on PHP and MySQL.
Author: 'Mirantis, Inc' Author: 'Mirantis, Inc'
Tags: [CMS, PHP, Web] Tags: [CMS, PHP, Web]
Classes: Classes:
io.murano.apps.WordPress: WordPress.yaml com.example.WordPress: WordPress.yaml

View File

@ -11,7 +11,7 @@
# under the License. # under the License.
Namespaces: Namespaces:
=: io.murano.apps =: com.example
std: io.murano std: io.murano
res: io.murano.resources res: io.murano.resources
sys: io.murano.system sys: io.murano.system

View File

@ -14,7 +14,7 @@ Version: 2
Application: Application:
?: ?:
type: io.murano.apps.ZabbixAgent type: com.example.ZabbixAgent
name: $.appConfiguration.name name: $.appConfiguration.name
hostname: $.appConfiguration.hostname hostname: $.appConfiguration.hostname
server: $.appConfiguration.server server: $.appConfiguration.server
@ -48,7 +48,7 @@ Forms:
Required for active checks and must match hostname as configured on the server. Required for active checks and must match hostname as configured on the server.
- name: server - name: server
type: io.murano.apps.ZabbixServer type: com.example.ZabbixServer
label: Zabbix Server label: Zabbix Server
description: >- description: >-
Select zabbix server to monitor activity Select zabbix server to monitor activity

View File

@ -12,11 +12,11 @@
Format: 1.0 Format: 1.0
Type: Application Type: Application
FullName: io.murano.apps.ZabbixAgent FullName: com.example.ZabbixAgent
Name: Zabbix Agent Name: Zabbix Agent
Description: | Description: |
Zabbix is the ultimate open source availability and performance monitoring solution. Zabbix offer advance monitoring, alerting, and visualization features today which are missing in other monitoring system, even some of the best commercial ones. Zabbix is the ultimate open source availability and performance monitoring solution. Zabbix offer advance monitoring, alerting, and visualization features today which are missing in other monitoring system, even some of the best commercial ones.
Author: 'Mirantis, Inc' Author: 'Mirantis, Inc'
Tags: [Monitoring] Tags: [Monitoring]
Classes: Classes:
io.murano.apps.ZabbixAgent: ZabbixAgent.yaml com.example.ZabbixAgent: ZabbixAgent.yaml

View File

@ -11,7 +11,7 @@
# under the License. # under the License.
Namespaces: Namespaces:
=: io.murano.apps =: com.example
std: io.murano std: io.murano
res: io.murano.resources res: io.murano.resources
sys: io.murano.system sys: io.murano.system

View File

@ -14,7 +14,7 @@ Version: 2
Application: Application:
?: ?:
type: io.murano.apps.ZabbixServer type: com.example.ZabbixServer
name: $.appConfiguration.name name: $.appConfiguration.name
database: $.dbConfiguration.database database: $.dbConfiguration.database
username: $.dbConfiguration.username username: $.dbConfiguration.username

View File

@ -12,7 +12,7 @@
Format: 1.0 Format: 1.0
Type: Application Type: Application
FullName: io.murano.apps.ZabbixServer FullName: com.example.ZabbixServer
Name: Zabbix Server Name: Zabbix Server
Description: | Description: |
Zabbix server is the central process of Zabbix software. Zabbix server is the central process of Zabbix software.
@ -20,4 +20,4 @@ Description: |
Author: 'Mirantis, Inc' Author: 'Mirantis, Inc'
Tags: [Monitoring] Tags: [Monitoring]
Classes: Classes:
io.murano.apps.ZabbixServer: ZabbixServer.yaml com.example.ZabbixServer: ZabbixServer.yaml