Yaml syntax cleanup

* remove 'error' like:
- no new line character at the end of file
- trailing spaces

Change-Id: I981f5353a5bd5bfb1546946b240a85905272887e
This commit is contained in:
alexz 2016-07-26 15:12:57 +03:00 committed by Aleksey Zvyagintsev
parent 001f04c3a2
commit 719a47fa86
12 changed files with 27 additions and 22 deletions

View File

@ -85,4 +85,5 @@ Methods:
Continue:
- $key: $pair[0].trim()
- $result[$key]: $pair[1].trim()
- Return: $result
- Return: $result

View File

@ -14,8 +14,10 @@ Format: 1.3
Type: Application
FullName: com.example.docker.DockerHTTPd
Name: Docker HTTPd
Description: |
The Apache HTTP Server, colloquially called Apache, is a Web server application notable for playing a key role in the initial growth of the World Wide Web.
Description: >-
The Apache HTTP Server, colloquially called Apache, is a Web server
application notable for playing a key role in the initial growth
of the World Wide Web.
Author: 'Mirantis, Inc'
Tags: [docker, application, httpd]
Classes:

View File

@ -15,7 +15,7 @@ Type: Application
FullName: com.example.docker.DockerInfluxDB
Name: Docker InfluxDB
Description: |
InfluxDB is a time series, events, and metrics database. Its written in Go and has no external dependencies. That means once you install it theres nothing else to manage (like Redis, HBase, or whatever).
InfluxDB is a time series, events, and metrics database. Its written in Go and has no external dependencies. That means once you install it theres nothing else to manage (like Redis, HBase, or whatever).
Author: 'Mirantis, Inc'
Tags: [docker, application, InfluxDB]
Classes:

View File

@ -19,7 +19,6 @@ Application:
host: $.appConfiguration.host
publish: $.appConfiguration.publish
password: $.appConfiguration.password
Forms:
- appConfiguration:

View File

@ -14,8 +14,11 @@ Format: 1.3
Type: Application
FullName: com.example.docker.DockerNginx
Name: Docker Nginx
Description: |
Nginx (pronounced “engine-x”) is an open source reverse proxy server for HTTP, HTTPS, SMTP, POP3, and IMAP protocols, as well as a load balancer, HTTP cache, and a web server (origin server).
Description: >-
Nginx (pronounced "engine-x") is an open source reverse
proxy server for HTTP, HTTPS, SMTP, POP3, and IMAP
protocols, as well as a load balancer, HTTP cache,
and a web server (origin server).
Author: 'Mirantis, Inc'
Tags: [docker, application, Nginx]
Classes:

View File

@ -14,8 +14,12 @@ Format: 1.3
Type: Application
FullName: com.example.docker.DockerTomcat
Name: Docker Tomcat
Description: |
Apache Tomcat (or simply Tomcat) is an open source web server and servlet container developed by the Apache Software Foundation (ASF). Tomcat implements the Java Servlet and the JavaServer Pages (JSP) specifications from Oracle, and provides a “pure Java” HTTP web server environment for Java code to run in.
Description: >-
Apache Tomcat (or simply Tomcat) is an open source web server and servlet
container developed by the Apache Software Foundation (ASF).
Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
specifications from Oracle, and provides a "pure Java" HTTP web server
environment for Java code to run in.
Author: 'Mirantis, Inc'
Tags: [docker, application, Tomcat]
Classes:
@ -24,3 +28,4 @@ Require:
com.mirantis.docker.DockerStandaloneHost:
com.mirantis.docker.kubernetes.KubernetesPod:
com.mirantis.docker.Interfaces:

View File

@ -18,7 +18,7 @@ Name: DockerHelpers
Methods:
labels2Map:
Arguments:
labelsString:
labelsString:
Contract: $.string().notNull()
Body:
- $result: {}
@ -35,8 +35,8 @@ Methods:
map2labels:
Arguments:
labelsMap:
Contract:
labelsMap:
Contract:
$.string().notNull(): $.string().notNull()
Body:
- Return: $labelsMap.select(list($, $labelsMap.get($)).join('=')).join(';')

View File

@ -21,7 +21,7 @@ Properties:
Methods:
getType:
getParameters:
getRepresentation:
@ -29,3 +29,4 @@ Methods:
Return:
type: $.getType()
parameters: $.getParameters()

View File

@ -18,10 +18,10 @@ Namespaces:
Name: DockerStandaloneHost
Extends:
Extends:
- DockerContainerHost
Properties:
Properties:
name:
Contract: $.string().notNull()
@ -59,8 +59,7 @@ Properties:
Methods:
.init:
Body:
- $._environment: $.find(std:Environment).require()
- $._environment: $.find(std:Environment).require()
deploy:
Body:

View File

@ -38,7 +38,6 @@ Methods:
- $.deployPod()
- $.setAttr(deployed, true)
deployPod:
Body:
- $resources: new(sys:Resources)

View File

@ -38,11 +38,9 @@ Methods:
- $.deployReplicationController()
- $.setAttr(deployed, true)
deployReplicationController:
Body:
- $resources: new(sys:Resources)
- $template: $resources.yaml('UpdateReplicationController.template').bind(dict(
controllerDefinition => $.replicationControllerDefinition,
isNew => true

View File

@ -38,11 +38,9 @@ Methods:
- $.deployService()
- $.setAttr(deployed, true)
deployService:
Body:
- $resources: new(sys:Resources)
- $template: $resources.yaml('UpdateService.template').bind(dict(
serviceDefinition => $.serviceDefinition,
isNew => true