Yaml syntax cleanup

* remove 'error' like: - no new line character at the end of file - trailing spaces Change-Id: I981f5353a5bd5bfb1546946b240a85905272887e
2016-07-26 15:12:57 +03:00 · 2016-07-26 15:12:57 +03:00 · 1c14e3231c
parent 3be200f07b
commit 1c14e3231c
22 changed files with 43 additions and 35 deletions
--- a/BIND/package/Classes/Bind.yaml
+++ b/BIND/package/Classes/Bind.yaml
@ -100,4 +100,5 @@ Methods:
      - message:
          Contract: $.string().notNull()
    Body:
-      -  $.environment.reporter.report($this, $message)
+      -  $.environment.reporter.report($this, $message)
+
--- a/Cassandra/package/Classes/CassandraNode.yaml
+++ b/Cassandra/package/Classes/CassandraNode.yaml
@ -115,4 +115,5 @@ Methods:
      - $msg: format('Restarting Cassandra node "{0}"', $.instance.name)
      - $._environment.reporter.report($this, $msg)
      - $command: format('sleep {0}; sudo service cassandra restart', $delay)
-      - conf:Linux.runCommand($.instance.agent, $command)
+      - conf:Linux.runCommand($.instance.agent, $command)
+
--- a/Clearwater/package/Classes/Clearwater.yaml
+++ b/Clearwater/package/Classes/Clearwater.yaml
@ -107,4 +107,5 @@ Methods:
      - message:
          Contract: $.string().notNull()
    Body:
-      -  $._environment.reporter.report($this, $message)
+      -  $._environment.reporter.report($this, $message)
+
--- a/Clearwater/package/Classes/components/Sprout.yaml
+++ b/Clearwater/package/Classes/components/Sprout.yaml
@ -50,4 +50,5 @@ Methods:

  getDeployScriptName:
    Body:
-      - Return: "deploySprout.sh"
+      - Return: "deploySprout.sh"
+
--- a/Docker/Applications/DockerApp/package/Classes/DockerApp.yaml
+++ b/Docker/Applications/DockerApp/package/Classes/DockerApp.yaml
@ -85,4 +85,5 @@ Methods:
              Continue:
          - $key: $pair[0].trim()
          - $result[$key]: $pair[1].trim()
-      - Return: $result
+      - Return: $result
+
--- a/Docker/Applications/HTTPdServer/package/manifest.yaml
+++ b/Docker/Applications/HTTPdServer/package/manifest.yaml
@ -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:
--- a/Docker/Applications/InfluxDB/package/manifest.yaml
+++ b/Docker/Applications/InfluxDB/package/manifest.yaml
@ -15,7 +15,7 @@ Type: Application
 FullName: com.example.docker.DockerInfluxDB
 Name: Docker InfluxDB
 Description: |
- InfluxDB is a time series, events, and metrics database. It’s written in Go and has no external dependencies. That means once you install it there’s nothing else to manage (like Redis, HBase, or whatever). 
+ InfluxDB is a time series, events, and metrics database. It’s written in Go and has no external dependencies. That means once you install it there’s nothing else to manage (like Redis, HBase, or whatever).
 Author: 'Mirantis, Inc'
 Tags: [docker, application, InfluxDB]
 Classes:
--- a/Docker/Applications/MariaDB/package/UI/ui.yaml
+++ b/Docker/Applications/MariaDB/package/UI/ui.yaml
@ -19,7 +19,6 @@ Application:
  host: $.appConfiguration.host
  publish: $.appConfiguration.publish
  password: $.appConfiguration.password
-  

 Forms:
  - appConfiguration:
--- a/Docker/Applications/Nginx/package/manifest.yaml
+++ b/Docker/Applications/Nginx/package/manifest.yaml
@ -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:
--- a/Docker/Applications/Tomcat/package/manifest.yaml
+++ b/Docker/Applications/Tomcat/package/manifest.yaml
@ -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:
+
--- a/Docker/DockerInterfacesLibrary/package/Classes/DockerHelpers.yaml
+++ b/Docker/DockerInterfacesLibrary/package/Classes/DockerHelpers.yaml
@ -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(';')
--- a/Docker/DockerInterfacesLibrary/package/Classes/DockerVolume.yaml
+++ b/Docker/DockerInterfacesLibrary/package/Classes/DockerVolume.yaml
@ -21,7 +21,7 @@ Properties:

 Methods:
  getType:
-  
+
  getParameters:

  getRepresentation:
@ -29,3 +29,4 @@ Methods:
      Return:
        type: $.getType()
        parameters: $.getParameters()
+
--- a/Docker/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml
+++ b/Docker/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml
@ -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:
--- a/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Pod.yaml
+++ b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Pod.yaml
@ -38,7 +38,6 @@ Methods:
          - $.deployPod()
          - $.setAttr(deployed, true)

-              
  deployPod:
    Body:
      - $resources: new(sys:Resources)
--- a/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/ReplicationController.yaml
+++ b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/ReplicationController.yaml
@ -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
--- a/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Service.yaml
+++ b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Service.yaml
@ -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
--- a/PivotalOperationsManager/package/Classes/OpsManager.yaml
+++ b/PivotalOperationsManager/package/Classes/OpsManager.yaml
@ -183,4 +183,5 @@ Methods:
              properties:
                name: $._securityGroupName
      - $._environment.stack.updateTemplate($template)
-      - $._environment.stack.push()
+      - $._environment.stack.push()
+
--- a/RefStackClient/package/UI/ui.yaml
+++ b/RefStackClient/package/UI/ui.yaml
@ -85,4 +85,5 @@ Forms:
          helpText: Just letters, numbers, underscores and hyphens are allowed.
          description: >-
            Specify a string, that will be used in instance hostname.
-            Just A-Z, a-z, 0-9, dash and underline are allowed.
+            Just A-Z, a-z, 0-9, dash and underline are allowed.
+
--- a/Windows/ActiveDirectory/package/UI/ui.yaml
+++ b/Windows/ActiveDirectory/package/UI/ui.yaml
@ -144,7 +144,6 @@ Forms:
          description: >-
             Select to true to assign floating IP automatically to Primary DC
          initial: false
-          required: false

        - name: unitNamingPattern
          type: string
@ -202,4 +201,5 @@ Forms:
          type: azone
          label: Availability zone
          description: Select availability zone where service would be installed.
-          required: false
+          required: false
+
--- a/WordPress/package/UI/ui.yaml
+++ b/WordPress/package/UI/ui.yaml
@ -21,7 +21,6 @@ Application:
  dbName: $.dbConfiguration.database
  dbUser: $.dbConfiguration.username
  dbPassword: $.dbConfiguration.password
-  

 Forms:
  - appConfiguration:
@ -59,7 +58,7 @@ Forms:
        - name: database
          type: string
          label: Database name
-          initial: wordpress 
+          initial: wordpress
          description: >-
            Please, provide database name that is going to be created
        - name: username
--- a/ZabbixAgent/package/Classes/ZabbixAgent.yaml
+++ b/ZabbixAgent/package/Classes/ZabbixAgent.yaml
@ -47,7 +47,7 @@ Methods:
      - $.server.deploy()
      - $resources: new(sys:Resources)
      - $securityGroupIngress:
-          - ToPort: 10050 
+          - ToPort: 10050
            FromPort: 10050
            IpProtocol: tcp
            External: true
--- a/ZabbixAgent/package/UI/ui.yaml
+++ b/ZabbixAgent/package/UI/ui.yaml
@ -18,7 +18,6 @@ Application:
  hostname: $.appConfiguration.hostname
  server: $.appConfiguration.server
  probe: $.appConfiguration.probeMethod
- 

 Forms:
  - appConfiguration:
@ -37,7 +36,6 @@ Forms:
          description: >-
            Unique, case sensitive hostname.
            Required for active checks and must match hostname as configured on the server.
-       
        - name: server
          type: com.example.ZabbixServer
          label: Zabbix Server