openstack/heat-templates
Code Issues Proposed changes

Fix linting errors in YAML

Browse Source 
This change corrects many problems detected by the `yamllint` linter.
It's a preparation for enabling this linter in change
Ie746230f28fe3ed0cf218201d5a3810f7bc44070.

For instance, the first run of the YAML linter helped discovering a key
duplication problem in `oso_ha.yaml`: the `depends_on` key was present
twice, so the first occurence was ignored.

Other changes are cosmetic: extra spaces, extra blank lines, missing
newlines at end-of-file, etc.

Change-Id: I7f2369adfb152fd2a74b9b105e969e653e592922
This commit is contained in:
Adrien Vergé 2016-02-02 21:32:15 +01:00
parent 96a0b0b3d2
commit 2a2fe91602
50 changed files with 143 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cfn/F17/WordPress_Single_Instance.yaml
View File

@ -156,4 +156,3 @@ Outputs:
- Fn::GetAtt: [WebServer, PublicIp]
- /wordpress
Description: URL for Wordpress service

1
cfn/F17/WordPress_Single_Instance_With_HA.yaml
View File

@ -325,4 +325,3 @@ Outputs:
- Fn::GetAtt: [WikiDatabase, PublicIp]
- /wordpress
Description: URL for Wordpress wiki

1
cfn/F17/invalid/AutoScalingMultiAZSample.yaml
View File

@ -274,4 +274,3 @@ Outputs:
- - http://
- Fn::GetAtt: [ElasticLoadBalancer, DNSName]
- /wordpress

1
cfn/F18/WordPress_NoKey.yaml
View File

@ -158,4 +158,3 @@ Outputs:
- Fn::GetAtt: [WikiDatabase, PublicIp]
- /wordpress
Description: URL for Wordpress wiki

1
cfn/F19/WordPress_NoKey.yaml
View File

@ -157,4 +157,3 @@ Outputs:
- Fn::GetAtt: [WikiDatabase, PublicIp]
- /wordpress
Description: URL for Wordpress wiki

1
hot/keystone/keystone_project.yaml
View File

@ -27,4 +27,3 @@ resources:
outputs:
admin_project_id:
value: {get_resource: admin_project}

1
hot/keystone/keystone_region.yaml
View File

@ -38,4 +38,3 @@ outputs:
value: {get_resource: parent_region}
child_region_id:
value: {get_resource: child_region}

1
hot/keystone/keystone_service_endpoint.yaml
View File

@ -56,4 +56,3 @@ resources:
url: {get_param: admin_url}
region: {get_param: region}
interface: admin

1
hot/server_with_encrpyted_volume.yaml
View File

@ -82,4 +82,3 @@ outputs:
instance_ip:
description: Public IP address of the newly created Nova instance.
value: { get_attr: [nova_instance, first_address] }

1
hot/software-config/example-templates/example-os-apply-config-plus-cloud-config.yaml
View File

@ -77,4 +77,3 @@ outputs:
deployment_stderr:
description: Standard error captured from the configuration execution.
value: { get_attr: [deployment, deploy_stderr] }

1
hot/software-config/example-templates/example-sw-component-template.yaml
View File

@ -87,4 +87,3 @@ outputs:
value: { get_attr: [ server, networks, private, 0 ] }
sw_component_last_action:
value: { get_attr: [ sw_deployment, last_action ] }

1
openshift-origin/centos65/OpenShift-1B1N.yaml
View File

@ -156,4 +156,3 @@ resources:
$dns_server$: { get_param: dns_server }
$dns_sec_key$: { get_attr: [ broker_wait_condition, Data ] }
$broker_ip$: { get_attr: [ OpenShiftBroker, first_address ] }

1
openshift-origin/centos65/OpenShift.yaml
View File

@ -81,4 +81,3 @@ resources:
$dns_server$: { get_param: dns_server }
$user_name$: { get_param: user_name }
$password$: { get_param: password }

3
openshift-origin/centos65/highly-available/invalid/oso_ha.yaml
View File

@ -331,8 +331,7 @@ resources:
###
broker1_instance:
type: OS::Nova::Server
depends_on: broker2_wait_condition
depends_on: broker3_wait_condition
depends_on: [broker2_wait_condition, broker3_wait_condition]
properties:
name: oso_broker1
image: { get_param: broker_image }