Merge "Fix linting errors in YAML"

cfn/F17/WordPress_Single_Instance.yaml

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

cfn/F17/WordPress_Single_Instance_With_HA.yaml

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

cfn/F17/invalid/AutoScalingMultiAZSample.yaml

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

cfn/F18/WordPress_NoKey.yaml

@@ -51,8 +51,8 @@ Resources:
         CidrIp: '0.0.0.0/0'
       - IpProtocol: 'tcp'
         FromPort: '22'
-        ToPort : '22'
+        ToPort: '22'
-        CidrIp : '0.0.0.0/0'
+        CidrIp: '0.0.0.0/0'
   WikiDatabase:
     Type: AWS::EC2::Instance
     Metadata:
@@ -75,7 +75,7 @@ Resources:
         - {Ref: InstanceType}
         - Image
       InstanceType: {Ref: InstanceType}
-      SecurityGroups: [{"Ref" : "WebServerSecurityGroup"}]
+      SecurityGroups: [{"Ref": "WebServerSecurityGroup"}]
       UserData:
         Fn::Base64:
           Fn::Join:
@@ -158,4 +158,3 @@ Outputs:
         - Fn::GetAtt: [WikiDatabase, PublicIp]
         - /wordpress
     Description: URL for Wordpress wiki
-

cfn/F19/WordPress_NoKey.yaml

@@ -53,8 +53,8 @@ Resources:
         CidrIp: 0.0.0.0/0
       - IpProtocol: tcp
         FromPort: '22'
-        ToPort : '22'
+        ToPort: '22'
-        CidrIp : 0.0.0.0/0
+        CidrIp: 0.0.0.0/0
   WikiDatabase:
     Type: AWS::EC2::Instance
     Metadata:
@@ -77,7 +77,7 @@ Resources:
         - {Ref: InstanceType}
         - Image
       InstanceType: {Ref: InstanceType}
-      SecurityGroups: [{"Ref" : "WebServerSecurityGroup"}]
+      SecurityGroups: [{"Ref": "WebServerSecurityGroup"}]
       UserData:
         Fn::Base64:
           Fn::Join:
@@ -157,4 +157,3 @@ Outputs:
         - Fn::GetAtt: [WikiDatabase, PublicIp]
         - /wordpress
     Description: URL for Wordpress wiki
-

cfn/deb/MultiNode_DevStack.yaml

@@ -133,7 +133,7 @@ Resources:
                 Fn::Join:
                 - ''
                 - - AWSAccessKeyId=
-                  - {Ref : CfnUserKey}
+                  - {Ref: CfnUserKey}
                   - '
 
                     '

hot/F18/WordPress_Native.yaml

@@ -11,7 +11,7 @@ parameters:
 
   key_name:
     type: string
-    description : Name of a KeyPair to enable SSH access to the instance
+    description: Name of a KeyPair to enable SSH access to the instance
   instance_type:
     type: string
     description: Instance type for WordPress server

hot/F18/WordPress_NoKey.yaml

@@ -82,8 +82,8 @@ resources:
           CidrIp: '0.0.0.0/0'
         - IpProtocol: 'tcp'
           FromPort: '22'
-          ToPort : '22'
+          ToPort: '22'
-          CidrIp : '0.0.0.0/0'
+          CidrIp: '0.0.0.0/0'
 
   wordpress_instance:
     # Use an AWS resource type and switch to native compute instance as

hot/F20/WordPress_2_Instances.yaml

@@ -11,7 +11,7 @@ parameters:
 
   key_name:
     type: string
-    description : Name of a KeyPair to enable SSH access to the instance
+    description: Name of a KeyPair to enable SSH access to the instance
     default: test_key
 
   instance_type:

hot/F20/WordPress_Native.yaml

@@ -11,7 +11,7 @@ parameters:
 
   key_name:
     type: string
-    description : Name of a KeyPair to enable SSH access to the instance
+    description: Name of a KeyPair to enable SSH access to the instance
   instance_type:
     type: string
     description: Instance type for WordPress server

hot/Windows/ActiveDirectoryController/ActiveDirectoryDomainController.yaml

@@ -29,7 +29,7 @@ parameters:
     constraints:
       - length: { min: 3, max: 256 }
       - allowed_pattern: "[A-Za-z0-9]+(?=[\\.\\-][a-zA-Z0-9])*\\.[a-zA-z09]+"
-        description : must be a valid DNS name.
+        description: must be a valid DNS name.
 
   domain_netbios_name:
     default: cloudbase

hot/chef-server.yaml

@@ -5,7 +5,7 @@ description: Heat template to deploy Open Source CHEF server on a VM
 parameters:
   ssh_key_name:
     type: string
-    description : Name of a Key Pair to enable SSH access to the instance
+    description: Name of a Key Pair to enable SSH access to the instance
 
   chef_image_name:
     type: string
@@ -34,7 +34,7 @@ parameters:
     - length: { min: 1, max: 25 }
       description: Password MUST be between 1 - 25 characters.
     - allowed_pattern: "[a-zA-Z0-9]*"
-      description : Only Alpha-Numeric characters are allowed.
+      description: Only Alpha-Numeric characters are allowed.
 
 resources:
   ChefServer:

hot/keystone/keystone_project.yaml

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

hot/keystone/keystone_region.yaml

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

hot/keystone/keystone_service_endpoint.yaml

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

hot/mistral/templates/server_with_ip.yaml

@@ -36,8 +36,8 @@ resources:
       SecurityGroupIngress:
         - IpProtocol: 'tcp'
           FromPort: '22'
-          ToPort : '22'
+          ToPort: '22'
-          CidrIp : '0.0.0.0/0'
+          CidrIp: '0.0.0.0/0'
 
 outputs:
   ip:

hot/server_with_encrpyted_volume.yaml

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

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

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

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

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

hot/software-config/example-templates/wordpress/WordPress_software-config_1-instance.yaml

@@ -18,7 +18,7 @@ description: >
 parameters:
   key_name:
     type: string
-    description : Name of a key pair to enable SSH access to instances.
+    description: Name of a key pair to enable SSH access to instances.
     default: default
   flavor:
     type: string

hot/software-config/example-templates/wordpress/WordPress_software-config_2-instances.yaml

@@ -18,7 +18,7 @@ description: >
 parameters:
   key_name:
     type: string
-    description : Name of a key pair to enable SSH access to instances.
+    description: Name of a key pair to enable SSH access to instances.
     default: default
   flavor:
     type: string

openshift-origin/F19/hot-template/openshift-scalable-cpu-nbgears/nodeinstance.yaml

@@ -194,17 +194,17 @@ resources:
     node_port:
       type: OS::Neutron::Port
       properties:
-        network_id:  {get_param: private_network}
+        network_id: {get_param: private_network}
         fixed_ips: [
-          subnet_id:  {get_param: private_sub_network}
+          subnet_id: {get_param: private_sub_network}
         ]
         security_groups: [{get_param: security_group}]
 
     node_floating_ip:
       type: OS::Neutron::FloatingIP
       properties:
-        floating_network_id:  {get_param: public_net_id}
+        floating_network_id: {get_param: public_net_id}
-        port_id:  {get_resource: node_port}
+        port_id: {get_resource: node_port}
 
     node_user_data:
       type: OS::Heat::SoftwareConfig
@@ -285,10 +285,10 @@ resources:
       type: OS::Nova::Server
       properties:
         image: {get_param: image_node_name}
-        flavor:  {get_param: node_flavor}
+        flavor: {get_param: node_flavor}
         key_name: {get_param: ssh_key}
         networks: [
-          port:  {get_resource: node_port}
+          port: {get_resource: node_port}
         ]
         user_data: {get_resource: node_user_data}
         user_data_format: RAW

openshift-origin/F19/hot-template/openshift-scalable-cpu/nodeinstance.yaml

@@ -194,17 +194,17 @@ resources:
     node_port:
       type: OS::Neutron::Port
       properties:
-        network_id:  {get_param: private_network}
+        network_id: {get_param: private_network}
         fixed_ips: [
-          subnet_id:  {get_param: private_sub_network}
+          subnet_id: {get_param: private_sub_network}
         ]
         security_groups: [{get_param: security_group}]
 
     node_floating_ip:
       type: OS::Neutron::FloatingIP
       properties:
-        floating_network_id:  {get_param: public_net_id}
+        floating_network_id: {get_param: public_net_id}
-        port_id:  {get_resource: node_port}
+        port_id: {get_resource: node_port}
 
     node_user_data:
       type: OS::Heat::SoftwareConfig
@@ -285,10 +285,10 @@ resources:
       type: OS::Nova::Server
       properties:
         image: {get_param: image_node_name}
-        flavor:  {get_param: node_flavor}
+        flavor: {get_param: node_flavor}
         key_name: {get_param: ssh_key}
         networks: [
-          port:  {get_resource: node_port}
+          port: {get_resource: node_port}
         ]
         user_data: {get_resource: node_user_data}
         user_data_format: RAW

openshift-origin/F19/hot-template/openshift-scalable-nbgears/nodeinstance.yaml

@@ -192,17 +192,17 @@ resources:
     node_port:
       type: OS::Neutron::Port
       properties:
-        network_id:  {get_param: private_network}
+        network_id: {get_param: private_network}
         fixed_ips: [
-          subnet_id:  {get_param: private_sub_network}
+          subnet_id: {get_param: private_sub_network}
         ]
         security_groups: [{get_param: security_group}]
 
     node_floating_ip:
       type: OS::Neutron::FloatingIP
       properties:
-        floating_network_id:  {get_param: public_net_id}
+        floating_network_id: {get_param: public_net_id}
-        port_id:  {get_resource: node_port}
+        port_id: {get_resource: node_port}
 
     node_user_data:
       type: OS::Heat::SoftwareConfig
@@ -283,10 +283,10 @@ resources:
       type: OS::Nova::Server
       properties:
         image: {get_param: image_node_name}
-        flavor:  {get_param: node_flavor}
+        flavor: {get_param: node_flavor}
         key_name: {get_param: ssh_key}
         networks: [
-          port:  {get_resource: node_port}
+          port: {get_resource: node_port}
         ]
         user_data: {get_resource: node_user_data}
         user_data_format: RAW

openshift-origin/F19/hot-template/openshift/openshift.yaml

@@ -383,17 +383,17 @@ resources:
     node_port:
       type: OS::Neutron::Port
       properties:
-        network_id:  {get_resource: private_network}
+        network_id: {get_resource: private_network}
         fixed_ips: [
-          subnet_id:  {get_resource: private_sub_network}
+          subnet_id: {get_resource: private_sub_network}
         ]
         security_groups: [{get_resource: openshift_origin_security_group}]
 
     node_floating_ip:
       type: OS::Neutron::FloatingIP
       properties:
-        floating_network_id:  {get_param: public_net_id}
+        floating_network_id: {get_param: public_net_id}
-        port_id:  {get_resource: node_port}
+        port_id: {get_resource: node_port}
 
     node_wait_handle:
       type: AWS::CloudFormation::WaitConditionHandle
@@ -484,10 +484,10 @@ resources:
       type: OS::Nova::Server
       properties:
         image: {get_param: image_node_name}
-        flavor:  {get_param: node_flavor}
+        flavor: {get_param: node_flavor}
         key_name: {get_resource: ssh_key}
         networks: [
-          port:  {get_resource: node_port}
+          port: {get_resource: node_port}
         ]
         user_data: {get_resource: node_user_data}
         user_data_format: RAW

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

@@ -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 ] }
-

openshift-origin/centos65/OpenShift.yaml

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

openshift-origin/centos65/highly-available/invalid/oso_ha.yaml

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