Fix indentation warnings CI/CD

After patch Ia2498bdb0f7c310ec3d2c2f11f5d3fc08c8b352c there is possible to
run check for yaml and shell syntax.
This patch is oriented to fix some similar Warnings reported in yaml
syntax check for CI/CD apps, like "(indentation)".

Change-Id: Ie2d854e6feef6362ea07d6132e71072dae49b5d7
This commit is contained in:
Sergey Kraynev 2016-08-01 11:42:11 +03:00
parent 9288270ca0
commit 5e046b2169
15 changed files with 56 additions and 56 deletions

View File

@ -38,22 +38,22 @@ Methods:
Return: Return:
- $securityGroupIngress: - $securityGroupIngress:
- ToPort: 80 - ToPort: 80
FromPort: 80 FromPort: 80
IpProtocol: tcp IpProtocol: tcp
External: true External: true
- ToPort: 443 - ToPort: 443
FromPort: 443 FromPort: 443
IpProtocol: tcp IpProtocol: tcp
External: true External: true
- ToPort: 8081 - ToPort: 8081
FromPort: 8081 FromPort: 8081
IpProtocol: tcp IpProtocol: tcp
External: true External: true
- ToPort: 29418 - ToPort: 29418
FromPort: 29418 FromPort: 29418
IpProtocol: tcp IpProtocol: tcp
External: true External: true
- $._environment.securityGroupManager.addGroupIngress($securityGroupIngress) - $._environment.securityGroupManager.addGroupIngress($securityGroupIngress)
- $._environment.reporter.report($this, 'Creating VM for Gerrit "{0}"'.format($.instance.name)) - $._environment.reporter.report($this, 'Creating VM for Gerrit "{0}"'.format($.instance.name))

View File

@ -8,7 +8,7 @@ Description: |
Author: 'Mirantis, Inc' Author: 'Mirantis, Inc'
Tags: [Server, Java, CI, Jenkins] Tags: [Server, Java, CI, Jenkins]
Classes: Classes:
org.openstack.ci_cd_pipeline_murano_app.Jenkins: Jenkins.yaml org.openstack.ci_cd_pipeline_murano_app.Jenkins: Jenkins.yaml
UI: ui.yaml UI: ui.yaml
Logo: logo.png Logo: logo.png
Require: Require:

View File

@ -10,7 +10,7 @@ Description: |
Author: 'Mirantis, Inc' Author: 'Mirantis, Inc'
Tags: [Images, CI, Zuul, Jenkins] Tags: [Images, CI, Zuul, Jenkins]
Classes: Classes:
org.openstack.ci_cd_pipeline_murano_app.Nodepool: Nodepool.yaml org.openstack.ci_cd_pipeline_murano_app.Nodepool: Nodepool.yaml
UI: ui.yaml UI: ui.yaml
Logo: logo.png Logo: logo.png
Require: Require:

View File

@ -8,7 +8,7 @@ Description: |
Author: 'Mirantis, Inc' Author: 'Mirantis, Inc'
Tags: [Server, LDAP] Tags: [Server, LDAP]
Classes: Classes:
org.openstack.ci_cd_pipeline_murano_app.OpenLDAP: OpenLDAP.yaml org.openstack.ci_cd_pipeline_murano_app.OpenLDAP: OpenLDAP.yaml
UI: ui.yaml UI: ui.yaml
Logo: logo.png Logo: logo.png
Require: Require:

View File

@ -11,7 +11,7 @@
# under the License. # under the License.
Namespaces: Namespaces:
=: org.openstack.ci_cd_pipeline_murano_app.puppet =: org.openstack.ci_cd_pipeline_murano_app.puppet
Name: Hiera Name: Hiera

View File

@ -11,9 +11,9 @@
# under the License. # under the License.
Namespaces: Namespaces:
=: org.openstack.ci_cd_pipeline_murano_app.puppet =: org.openstack.ci_cd_pipeline_murano_app.puppet
conf: io.murano.configuration conf: io.murano.configuration
sys: io.murano.system sys: io.murano.system
Name: PuppetClient Name: PuppetClient

View File

@ -11,10 +11,10 @@
# under the License. # under the License.
Namespaces: Namespaces:
=: org.openstack.ci_cd_pipeline_murano_app.puppet =: org.openstack.ci_cd_pipeline_murano_app.puppet
res: io.murano.resources res: io.murano.resources
std: io.murano std: io.murano
sys: io.murano.system sys: io.murano.system
Name: PuppetInstance Name: PuppetInstance
@ -22,7 +22,7 @@ Extends: res:LinuxMuranoInstance
Properties: Properties:
hiera: hiera:
Contract: $.class(Hiera) Contract: $.class(Hiera)
Methods: Methods:
.init: .init:

View File

@ -11,10 +11,10 @@
# under the License. # under the License.
Namespaces: Namespaces:
=: org.openstack.ci_cd_pipeline_murano_app.puppet =: org.openstack.ci_cd_pipeline_murano_app.puppet
conf: io.murano.configuration conf: io.murano.configuration
sys: io.murano.system sys: io.murano.system
net: org.openstack.ci_cd_pipeline_murano_app.puppet.net net: org.openstack.ci_cd_pipeline_murano_app.puppet.net
Name: PuppetServer Name: PuppetServer
@ -101,9 +101,9 @@ Methods:
_installPuppetModules: _installPuppetModules:
Body: Body:
- $modules: - $modules:
- 'puppetlabs-vcsrepo' - 'puppetlabs-vcsrepo'
- 'theforeman-git' - 'theforeman-git'
- 'theforeman-puppet' - 'theforeman-puppet'
- $this.clients.select($.instance).append($this.masterInstance).selectMany( - $this.clients.select($.instance).append($this.masterInstance).selectMany(
let(x => $) -> $modules.select( let(x => $) -> $modules.select(

View File

@ -11,7 +11,7 @@
# under the License. # under the License.
Namespaces: Namespaces:
=: org.openstack.ci_cd_pipeline_murano_app.puppet =: org.openstack.ci_cd_pipeline_murano_app.puppet
Name: YamlFile Name: YamlFile

View File

@ -12,9 +12,9 @@
# TODO: Make every method of this class static when moving to Mitaka # TODO: Make every method of this class static when moving to Mitaka
Namespaces: Namespaces:
=: org.openstack.ci_cd_pipeline_murano_app.puppet =: org.openstack.ci_cd_pipeline_murano_app.puppet
res: io.murano.resources res: io.murano.resources
sys: io.murano.system sys: io.murano.system
Name: YamlTool Name: YamlTool

View File

@ -40,7 +40,7 @@ Methods:
addHostByInstance: addHostByInstance:
Arguments: Arguments:
- instance: - instance:
Contract: $.class(res:LinuxMuranoInstance).notNull() Contract: $.class(res:LinuxMuranoInstance).notNull()
- aliases: - aliases:
Contract: Contract:
- $.string() - $.string()
@ -57,17 +57,17 @@ Methods:
# #
getHostName: getHostName:
Arguments: Arguments:
- instance: - instance:
Contract: $.class(res:LinuxMuranoInstance).notNull() Contract: $.class(res:LinuxMuranoInstance).notNull()
- fqdn: - fqdn:
Contract: $.bool().notNull() Contract: $.bool().notNull()
Default: false Default: false
Body: Body:
- $linux: new(conf:Linux) - $linux: new(conf:Linux)
- If: $fqdn - If: $fqdn
Then: Then:
- Return: $linux.runCommand($instance.agent, 'hostname -f').stdout - Return: $linux.runCommand($instance.agent, 'hostname -f').stdout
- Return: $linux.runCommand($instance.agent, 'hostname -s').stdout - Return: $linux.runCommand($instance.agent, 'hostname -s').stdout

View File

@ -7,4 +7,4 @@
- murano - murano
:yaml: :yaml:
:datadir: /etc/puppet/hieradata :datadir: /etc/puppet/hieradata

View File

@ -8,7 +8,7 @@ Description: |
Author: 'Mirantis, Inc' Author: 'Mirantis, Inc'
Tags: [CI] Tags: [CI]
Classes: Classes:
org.openstack.ci_cd_pipeline_murano_app.puppet.SystemConfig: SystemConfig.yaml org.openstack.ci_cd_pipeline_murano_app.puppet.SystemConfig: SystemConfig.yaml
UI: ui.yaml UI: ui.yaml
Logo: logo.png Logo: logo.png
Require: Require:

View File

@ -116,14 +116,14 @@ Methods:
_createPeriodicLayoutUpdate: _createPeriodicLayoutUpdate:
Body: Body:
- $resources: new(sys:Resources) - $resources: new(sys:Resources)
- $linux: new(conf:Linux) - $linux: new(conf:Linux)
- $script: $resources.string('scripts/update_layout.sh') - $script: $resources.string('scripts/update_layout.sh')
- $._environment.reporter.report($this, '[Zuul] Creating autoupdating layout.yaml file...') - $._environment.reporter.report($this, '[Zuul] Creating autoupdating layout.yaml file...')
- $linux.putFile($.instance.agent, $script, '/usr/local/bin/update_layout.sh') - $linux.putFile($.instance.agent, $script, '/usr/local/bin/update_layout.sh')
- $manifest: $resources.string('scripts/update_layout.pp') - $manifest: $resources.string('scripts/update_layout.pp')
- $this.instance.applyManifest($manifest, 60) - $this.instance.applyManifest($manifest, 60)
destroy: destroy:
Body: Body:

View File

@ -7,7 +7,7 @@ Description: |
Author: 'Mirantis, Inc' Author: 'Mirantis, Inc'
Tags: [CI, Zuul] Tags: [CI, Zuul]
Classes: Classes:
org.openstack.ci_cd_pipeline_murano_app.Zuul: Zuul.yaml org.openstack.ci_cd_pipeline_murano_app.Zuul: Zuul.yaml
UI: ui.yaml UI: ui.yaml
Require: Require:
org.openstack.ci_cd_pipeline_murano_app.puppet.Puppet: org.openstack.ci_cd_pipeline_murano_app.puppet.Puppet: