From 6a5a03c1923ba19672664f27d4d36bcacf179859 Mon Sep 17 00:00:00 2001 From: Sergey Kraynev Date: Mon, 1 Aug 2016 11:48:28 +0300 Subject: [PATCH] Fix indentation warnings LBaaS 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 LBaaS apps, like "(indentation)". Change-Id: I6f2b1af8ab7cee75d153c8f18bbea8ac67cc65b4 --- .../HAProxy/package/Classes/HAProxy.yaml | 24 +++++++++---------- .../package/Classes/LoadBalancer.yaml | 8 +++---- .../package/Classes/Listener.yaml | 2 +- .../package/Classes/LoadBalancer.yaml | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/murano-apps/HAProxy/package/Classes/HAProxy.yaml b/murano-apps/HAProxy/package/Classes/HAProxy.yaml index 325bf19..8b95c3f 100644 --- a/murano-apps/HAProxy/package/Classes/HAProxy.yaml +++ b/murano-apps/HAProxy/package/Classes/HAProxy.yaml @@ -51,18 +51,18 @@ Methods: deploy: Body: - - If: not $.getAttr(installed, false) - Then: - - $securityGroupIngress: - - ToPort: $this.port - FromPort: $this.port - IpProtocol: tcp - External: true - - $._environment.securityGroupManager.addGroupIngress($securityGroupIngress) - - $this.installLB() - - $.setAttr(installed, true) - - $this.syncSettings() - - $._environment.reporter.report($this, format('HA-proxy is available at {0}', $this.getEndpoint())) + - If: not $.getAttr(installed, false) + Then: + - $securityGroupIngress: + - ToPort: $this.port + FromPort: $this.port + IpProtocol: tcp + External: true + - $._environment.securityGroupManager.addGroupIngress($securityGroupIngress) + - $this.installLB() + - $.setAttr(installed, true) + - $this.syncSettings() + - $._environment.reporter.report($this, format('HA-proxy is available at {0}', $this.getEndpoint())) createPool: Arguments: diff --git a/murano-apps/LBaaS-interface/package/Classes/LoadBalancer.yaml b/murano-apps/LBaaS-interface/package/Classes/LoadBalancer.yaml index af37eab..0579712 100644 --- a/murano-apps/LBaaS-interface/package/Classes/LoadBalancer.yaml +++ b/murano-apps/LBaaS-interface/package/Classes/LoadBalancer.yaml @@ -54,10 +54,10 @@ Methods: - $.environment.reporter.report($this, 'Creating security groups...') - $securityGroupIngress: - - ToPort: 65535 - FromPort: 1 - IpProtocol: tcp - External: true + - ToPort: 65535 + FromPort: 1 + IpProtocol: tcp + External: true - $.environment.securityGroupManager.addGroupIngress($securityGroupIngress) - $.environment.reporter.report($this, 'Creating instance for LBaaS...') - $.instance.deploy() diff --git a/murano-apps/LbaaSLibrary/package/Classes/Listener.yaml b/murano-apps/LbaaSLibrary/package/Classes/Listener.yaml index 1aba66a..e8c0545 100644 --- a/murano-apps/LbaaSLibrary/package/Classes/Listener.yaml +++ b/murano-apps/LbaaSLibrary/package/Classes/Listener.yaml @@ -38,4 +38,4 @@ Properties: Methods: - updateListener: + updateListener: diff --git a/murano-apps/LbaaSLibrary/package/Classes/LoadBalancer.yaml b/murano-apps/LbaaSLibrary/package/Classes/LoadBalancer.yaml index f2f3b3a..53d9f7f 100644 --- a/murano-apps/LbaaSLibrary/package/Classes/LoadBalancer.yaml +++ b/murano-apps/LbaaSLibrary/package/Classes/LoadBalancer.yaml @@ -38,7 +38,7 @@ Methods: Body: - If: len(list($this.listeners.where($.name = $listener.name))) = 0 Then: - - $.listeners.append($listener) + - $.listeners.append($listener) Else: - $msg: 'Listener with provided name already exists' - $._environment.reporter.report_error($this, $msg)