diff --git a/cfn/F17/WordPress_Single_Instance.yaml b/cfn/F17/WordPress_Single_Instance.yaml index e40e98ae..1e47ad8e 100644 --- a/cfn/F17/WordPress_Single_Instance.yaml +++ b/cfn/F17/WordPress_Single_Instance.yaml @@ -156,4 +156,3 @@ Outputs: - Fn::GetAtt: [WebServer, PublicIp] - /wordpress Description: URL for Wordpress service - diff --git a/cfn/F17/WordPress_Single_Instance_With_HA.yaml b/cfn/F17/WordPress_Single_Instance_With_HA.yaml index abbd1a03..0c5bebcd 100644 --- a/cfn/F17/WordPress_Single_Instance_With_HA.yaml +++ b/cfn/F17/WordPress_Single_Instance_With_HA.yaml @@ -325,4 +325,3 @@ Outputs: - Fn::GetAtt: [WikiDatabase, PublicIp] - /wordpress Description: URL for Wordpress wiki - diff --git a/cfn/F17/invalid/AutoScalingMultiAZSample.yaml b/cfn/F17/invalid/AutoScalingMultiAZSample.yaml index bc4ca4b7..89068709 100644 --- a/cfn/F17/invalid/AutoScalingMultiAZSample.yaml +++ b/cfn/F17/invalid/AutoScalingMultiAZSample.yaml @@ -274,4 +274,3 @@ Outputs: - - http:// - Fn::GetAtt: [ElasticLoadBalancer, DNSName] - /wordpress - diff --git a/cfn/F18/WordPress_NoKey.yaml b/cfn/F18/WordPress_NoKey.yaml index 052166f3..5e992366 100644 --- a/cfn/F18/WordPress_NoKey.yaml +++ b/cfn/F18/WordPress_NoKey.yaml @@ -51,8 +51,8 @@ Resources: CidrIp: '0.0.0.0/0' - IpProtocol: 'tcp' FromPort: '22' - ToPort : '22' - CidrIp : '0.0.0.0/0' + ToPort: '22' + 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 - diff --git a/cfn/F19/WordPress_NoKey.yaml b/cfn/F19/WordPress_NoKey.yaml index ba9dfb56..63173651 100644 --- a/cfn/F19/WordPress_NoKey.yaml +++ b/cfn/F19/WordPress_NoKey.yaml @@ -53,8 +53,8 @@ Resources: CidrIp: 0.0.0.0/0 - IpProtocol: tcp FromPort: '22' - ToPort : '22' - CidrIp : 0.0.0.0/0 + ToPort: '22' + 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 - diff --git a/cfn/deb/MultiNode_DevStack.yaml b/cfn/deb/MultiNode_DevStack.yaml index c762d4fd..d7c06e3a 100644 --- a/cfn/deb/MultiNode_DevStack.yaml +++ b/cfn/deb/MultiNode_DevStack.yaml @@ -133,7 +133,7 @@ Resources: Fn::Join: - '' - - AWSAccessKeyId= - - {Ref : CfnUserKey} + - {Ref: CfnUserKey} - ' ' diff --git a/hot/F18/WordPress_Native.yaml b/hot/F18/WordPress_Native.yaml index 0c4dff0f..c42f952f 100644 --- a/hot/F18/WordPress_Native.yaml +++ b/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 diff --git a/hot/F18/WordPress_NoKey.yaml b/hot/F18/WordPress_NoKey.yaml index 46da4553..ce8e9858 100644 --- a/hot/F18/WordPress_NoKey.yaml +++ b/hot/F18/WordPress_NoKey.yaml @@ -82,8 +82,8 @@ resources: CidrIp: '0.0.0.0/0' - IpProtocol: 'tcp' FromPort: '22' - ToPort : '22' - CidrIp : '0.0.0.0/0' + ToPort: '22' + CidrIp: '0.0.0.0/0' wordpress_instance: # Use an AWS resource type and switch to native compute instance as diff --git a/hot/F20/WordPress_2_Instances.yaml b/hot/F20/WordPress_2_Instances.yaml index 92fb6035..d7c963d3 100644 --- a/hot/F20/WordPress_2_Instances.yaml +++ b/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: diff --git a/hot/F20/WordPress_Native.yaml b/hot/F20/WordPress_Native.yaml index b31837e5..8891390f 100644 --- a/hot/F20/WordPress_Native.yaml +++ b/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 diff --git a/hot/Windows/ActiveDirectoryController/ActiveDirectoryDomainController.yaml b/hot/Windows/ActiveDirectoryController/ActiveDirectoryDomainController.yaml index 9471c631..f7a9064f 100644 --- a/hot/Windows/ActiveDirectoryController/ActiveDirectoryDomainController.yaml +++ b/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 diff --git a/hot/chef-server.yaml b/hot/chef-server.yaml index 7654e29a..f55b0346 100644 --- a/hot/chef-server.yaml +++ b/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: diff --git a/hot/keystone/keystone.yaml b/hot/keystone/keystone.yaml index af509142..345211d8 100644 --- a/hot/keystone/keystone.yaml +++ b/hot/keystone/keystone.yaml @@ -54,4 +54,4 @@ outputs: test_project_a_id: value: {get_resource: test_project_a} test_role_a_id: - value: {get_resource: test_role_a} \ No newline at end of file + value: {get_resource: test_role_a} diff --git a/hot/keystone/keystone_group.yaml b/hot/keystone/keystone_group.yaml index 4aca6e1d..deaf5ad4 100644 --- a/hot/keystone/keystone_group.yaml +++ b/hot/keystone/keystone_group.yaml @@ -38,4 +38,4 @@ resources: outputs: admin_group_id: - value: {get_resource: admin_group} \ No newline at end of file + value: {get_resource: admin_group} diff --git a/hot/keystone/keystone_project.yaml b/hot/keystone/keystone_project.yaml index e6e5d392..7b507de9 100644 --- a/hot/keystone/keystone_project.yaml +++ b/hot/keystone/keystone_project.yaml @@ -27,4 +27,3 @@ resources: outputs: admin_project_id: value: {get_resource: admin_project} - diff --git a/hot/keystone/keystone_region.yaml b/hot/keystone/keystone_region.yaml index 0e6ad2c6..db618858 100644 --- a/hot/keystone/keystone_region.yaml +++ b/hot/keystone/keystone_region.yaml @@ -38,4 +38,3 @@ outputs: value: {get_resource: parent_region} child_region_id: value: {get_resource: child_region} - diff --git a/hot/keystone/keystone_role.yaml b/hot/keystone/keystone_role.yaml index 50c182d0..e5bb4afd 100644 --- a/hot/keystone/keystone_role.yaml +++ b/hot/keystone/keystone_role.yaml @@ -16,4 +16,4 @@ resources: outputs: sample_role_id: value: {get_resource: sample_role} - description: Sample keystone role identifier \ No newline at end of file + description: Sample keystone role identifier diff --git a/hot/keystone/keystone_service_endpoint.yaml b/hot/keystone/keystone_service_endpoint.yaml index f2bdb371..e99d4b41 100644 --- a/hot/keystone/keystone_service_endpoint.yaml +++ b/hot/keystone/keystone_service_endpoint.yaml @@ -56,4 +56,3 @@ resources: url: {get_param: admin_url} region: {get_param: region} interface: admin - diff --git a/hot/keystone/keystone_updated.yaml b/hot/keystone/keystone_updated.yaml index 73052b49..9b53ef71 100644 --- a/hot/keystone/keystone_updated.yaml +++ b/hot/keystone/keystone_updated.yaml @@ -80,4 +80,4 @@ outputs: test_role_a_id: value: {get_resource: test_role_a} test_role_b_id: - value: {get_resource: test_role_b} \ No newline at end of file + value: {get_resource: test_role_b} diff --git a/hot/keystone/keystone_user.yaml b/hot/keystone/keystone_user.yaml index 69f12141..50467e40 100644 --- a/hot/keystone/keystone_user.yaml +++ b/hot/keystone/keystone_user.yaml @@ -56,4 +56,4 @@ resources: project: {get_param: group_role_project} outputs: admin_user_id: - value: {get_resource: admin_user} \ No newline at end of file + value: {get_resource: admin_user} diff --git a/hot/mistral/nova_networking_server_with_ip_env.yaml b/hot/mistral/nova_networking_server_with_ip_env.yaml index 5903dd6a..253b3836 100644 --- a/hot/mistral/nova_networking_server_with_ip_env.yaml +++ b/hot/mistral/nova_networking_server_with_ip_env.yaml @@ -1,4 +1,4 @@ # Specifies server resource which uses nova networking resource_registry: - "NovaNetwork::Server": templates/server_with_ip.yaml \ No newline at end of file + "NovaNetwork::Server": templates/server_with_ip.yaml diff --git a/hot/mistral/templates/server_with_ip.yaml b/hot/mistral/templates/server_with_ip.yaml index 068c0a99..63a49953 100644 --- a/hot/mistral/templates/server_with_ip.yaml +++ b/hot/mistral/templates/server_with_ip.yaml @@ -36,8 +36,8 @@ resources: SecurityGroupIngress: - IpProtocol: 'tcp' FromPort: '22' - ToPort : '22' - CidrIp : '0.0.0.0/0' + ToPort: '22' + CidrIp: '0.0.0.0/0' outputs: ip: diff --git a/hot/monasca/autoscaling.yaml b/hot/monasca/autoscaling.yaml index 6726ec06..8aa25594 100644 --- a/hot/monasca/autoscaling.yaml +++ b/hot/monasca/autoscaling.yaml @@ -84,4 +84,4 @@ resources: scale_group_id: {get_param: "OS::stack_id"} severity: low alarm_actions: - - {get_resource: down_notification} \ No newline at end of file + - {get_resource: down_notification} diff --git a/hot/server_with_encrpyted_volume.yaml b/hot/server_with_encrpyted_volume.yaml index 06feb063..1cd5f290 100644 --- a/hot/server_with_encrpyted_volume.yaml +++ b/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] } - diff --git a/hot/servers_in_existing_neutron_network_no_floating_ips.yaml b/hot/servers_in_existing_neutron_network_no_floating_ips.yaml index 16cf26a1..cbc7dc2e 100644 --- a/hot/servers_in_existing_neutron_network_no_floating_ips.yaml +++ b/hot/servers_in_existing_neutron_network_no_floating_ips.yaml @@ -1,78 +1,78 @@ -heat_template_version: 2013-05-23 - -description: HOT template to deploy two servers to an existing Neutron network. - -parameters: - key_name: - type: string - description: Name of keypair to assign to servers - image: - type: string - description: Name of image to use for servers - flavor: - type: string - description: Flavor to use for servers - net_id: - type: string - description: ID of Neutron network into which servers get deployed - subnet_id: - type: string - description: ID of Neutron sub network into which servers get deployed - -resources: - server1: - type: OS::Nova::Server - properties: - name: Server1 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: server1_port } - - server1_port: - type: OS::Neutron::Port - properties: - network_id: { get_param: net_id } - fixed_ips: - - subnet_id: { get_param: subnet_id } - security_groups: [{ get_resource: server_security_group }] - - server2: - type: OS::Nova::Server - properties: - name: Server2 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: server2_port } - - server2_port: - type: OS::Neutron::Port - properties: - network_id: { get_param: net_id } - fixed_ips: - - subnet_id: { get_param: subnet_id } - security_groups: [{ get_resource: server_security_group }] - - server_security_group: - type: OS::Neutron::SecurityGroup - properties: - description: Test group to demonstrate Neutron security group functionality with Heat. - name: test-security-group - rules: [ - {remote_ip_prefix: 0.0.0.0/0, - protocol: tcp, - port_range_min: 22, - port_range_max: 22}, - {remote_ip_prefix: 0.0.0.0/0, - protocol: icmp}] - -outputs: - server1_provider_ip: - description: IP address of server1 in provider network - value: { get_attr: [ server1, first_address ] } - server2_provider_ip: - description: IP address of server2 in provider network - value: { get_attr: [ server2, first_address ] } +heat_template_version: 2013-05-23 + +description: HOT template to deploy two servers to an existing Neutron network. + +parameters: + key_name: + type: string + description: Name of keypair to assign to servers + image: + type: string + description: Name of image to use for servers + flavor: + type: string + description: Flavor to use for servers + net_id: + type: string + description: ID of Neutron network into which servers get deployed + subnet_id: + type: string + description: ID of Neutron sub network into which servers get deployed + +resources: + server1: + type: OS::Nova::Server + properties: + name: Server1 + image: { get_param: image } + flavor: { get_param: flavor } + key_name: { get_param: key_name } + networks: + - port: { get_resource: server1_port } + + server1_port: + type: OS::Neutron::Port + properties: + network_id: { get_param: net_id } + fixed_ips: + - subnet_id: { get_param: subnet_id } + security_groups: [{ get_resource: server_security_group }] + + server2: + type: OS::Nova::Server + properties: + name: Server2 + image: { get_param: image } + flavor: { get_param: flavor } + key_name: { get_param: key_name } + networks: + - port: { get_resource: server2_port } + + server2_port: + type: OS::Neutron::Port + properties: + network_id: { get_param: net_id } + fixed_ips: + - subnet_id: { get_param: subnet_id } + security_groups: [{ get_resource: server_security_group }] + + server_security_group: + type: OS::Neutron::SecurityGroup + properties: + description: Test group to demonstrate Neutron security group functionality with Heat. + name: test-security-group + rules: [ + {remote_ip_prefix: 0.0.0.0/0, + protocol: tcp, + port_range_min: 22, + port_range_max: 22}, + {remote_ip_prefix: 0.0.0.0/0, + protocol: icmp}] + +outputs: + server1_provider_ip: + description: IP address of server1 in provider network + value: { get_attr: [ server1, first_address ] } + server2_provider_ip: + description: IP address of server2 in provider network + value: { get_attr: [ server2, first_address ] } diff --git a/hot/software-config/boot-config/container_agent_env.yaml b/hot/software-config/boot-config/container_agent_env.yaml index 5a17e518..2830ecbd 100644 --- a/hot/software-config/boot-config/container_agent_env.yaml +++ b/hot/software-config/boot-config/container_agent_env.yaml @@ -1,4 +1,4 @@ # Installs heat-container-agent on boot in a container resource_registry: - "Heat::InstallConfigAgent": templates/install_container_agent.yaml \ No newline at end of file + "Heat::InstallConfigAgent": templates/install_container_agent.yaml diff --git a/hot/software-config/boot-config/fedora_pip_env.yaml b/hot/software-config/boot-config/fedora_pip_env.yaml index d29a0d09..fbae7cfc 100644 --- a/hot/software-config/boot-config/fedora_pip_env.yaml +++ b/hot/software-config/boot-config/fedora_pip_env.yaml @@ -4,4 +4,4 @@ parameters: image: Fedora-x86_64-20-20140618-sda resource_registry: - "Heat::InstallConfigAgent": templates/install_config_agent_fedora_pip.yaml \ No newline at end of file + "Heat::InstallConfigAgent": templates/install_config_agent_fedora_pip.yaml diff --git a/hot/software-config/boot-config/fedora_yum_env.yaml b/hot/software-config/boot-config/fedora_yum_env.yaml index 29aee8bb..55c540f4 100644 --- a/hot/software-config/boot-config/fedora_yum_env.yaml +++ b/hot/software-config/boot-config/fedora_yum_env.yaml @@ -4,4 +4,4 @@ parameters: image: Fedora-x86_64-20-20140618-sda resource_registry: - "Heat::InstallConfigAgent": templates/install_config_agent_fedora_yum.yaml \ No newline at end of file + "Heat::InstallConfigAgent": templates/install_config_agent_fedora_yum.yaml diff --git a/hot/software-config/boot-config/none_env.yaml b/hot/software-config/boot-config/none_env.yaml index 91d130cd..b61464ad 100644 --- a/hot/software-config/boot-config/none_env.yaml +++ b/hot/software-config/boot-config/none_env.yaml @@ -2,4 +2,4 @@ # This environment can be used when the image already has the required agents # installed and configured. resource_registry: - "Heat::InstallConfigAgent": "OS::Heat::SoftwareConfig" \ No newline at end of file + "Heat::InstallConfigAgent": "OS::Heat::SoftwareConfig" diff --git a/hot/software-config/boot-config/templates/install_container_agent.yaml b/hot/software-config/boot-config/templates/install_container_agent.yaml index 7e3485ea..380bf9f1 100644 --- a/hot/software-config/boot-config/templates/install_container_agent.yaml +++ b/hot/software-config/boot-config/templates/install_container_agent.yaml @@ -30,4 +30,4 @@ resources: - config: {get_resource: install_container_agent} outputs: config: - value: {get_resource: node_init} \ No newline at end of file + value: {get_resource: node_init} diff --git a/hot/software-config/boot-config/test_image_env.yaml b/hot/software-config/boot-config/test_image_env.yaml index 4b1dd2e0..7b9db5ff 100644 --- a/hot/software-config/boot-config/test_image_env.yaml +++ b/hot/software-config/boot-config/test_image_env.yaml @@ -7,4 +7,4 @@ # test image to work with this environment resource_registry: - "Heat::InstallConfigAgent": templates/install_config_agent_test_image.yaml \ No newline at end of file + "Heat::InstallConfigAgent": templates/install_config_agent_test_image.yaml diff --git a/hot/software-config/boot-config/ubuntu_pip_env.yaml b/hot/software-config/boot-config/ubuntu_pip_env.yaml index 6c1c6ec2..76c2d6b9 100644 --- a/hot/software-config/boot-config/ubuntu_pip_env.yaml +++ b/hot/software-config/boot-config/ubuntu_pip_env.yaml @@ -4,4 +4,4 @@ parameters: image: trusty-server-cloudimg-amd64-disk1 resource_registry: - "Heat::InstallConfigAgent": templates/install_config_agent_ubuntu_pip.yaml \ No newline at end of file + "Heat::InstallConfigAgent": templates/install_config_agent_ubuntu_pip.yaml diff --git a/hot/software-config/example-templates/config-scripts/example-docker-compose.yml b/hot/software-config/example-templates/config-scripts/example-docker-compose.yml index f99eedf0..b92effff 100644 --- a/hot/software-config/example-templates/config-scripts/example-docker-compose.yml +++ b/hot/software-config/example-templates/config-scripts/example-docker-compose.yml @@ -3,4 +3,4 @@ busybox: image: busybox command: ['nc', '-p', '8080', '-l', '-l', '-e', 'echo', 'hello world!'] ports: - - 8080:8080 \ No newline at end of file + - 8080:8080 diff --git a/hot/software-config/example-templates/example-config-pristine-image.yaml b/hot/software-config/example-templates/example-config-pristine-image.yaml index 8ebcae13..5837730a 100644 --- a/hot/software-config/example-templates/example-config-pristine-image.yaml +++ b/hot/software-config/example-templates/example-config-pristine-image.yaml @@ -119,4 +119,4 @@ outputs: get_attr: [deployment, deploy_status_code] other_result: value: - get_attr: [other_deployment, result] \ No newline at end of file + get_attr: [other_deployment, result] diff --git a/hot/software-config/example-templates/example-config-pristine-image_env.yaml b/hot/software-config/example-templates/example-config-pristine-image_env.yaml index 7030db44..09276694 100644 --- a/hot/software-config/example-templates/example-config-pristine-image_env.yaml +++ b/hot/software-config/example-templates/example-config-pristine-image_env.yaml @@ -5,4 +5,4 @@ # See heat-templates/hot/software-config/boot-config for environments # for different distros and install methods resource_registry: - "Heat::InstallConfigAgent": "OS::Heat::SoftwareConfig" \ No newline at end of file + "Heat::InstallConfigAgent": "OS::Heat::SoftwareConfig" diff --git a/hot/software-config/example-templates/example-os-apply-config-plus-cloud-config.yaml b/hot/software-config/example-templates/example-os-apply-config-plus-cloud-config.yaml index 622a9e39..56b537ef 100644 --- a/hot/software-config/example-templates/example-os-apply-config-plus-cloud-config.yaml +++ b/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] } - diff --git a/hot/software-config/example-templates/example-pristine-atomic-docker-compose_env.yaml b/hot/software-config/example-templates/example-pristine-atomic-docker-compose_env.yaml index 4dcaebb1..87e40471 100644 --- a/hot/software-config/example-templates/example-pristine-atomic-docker-compose_env.yaml +++ b/hot/software-config/example-templates/example-pristine-atomic-docker-compose_env.yaml @@ -3,4 +3,4 @@ # installed and configured. # resource_registry: - "Heat::InstallConfigAgent": "OS::Heat::SoftwareConfig" \ No newline at end of file + "Heat::InstallConfigAgent": "OS::Heat::SoftwareConfig" diff --git a/hot/software-config/example-templates/example-pristine-atomic-tool_env.yaml b/hot/software-config/example-templates/example-pristine-atomic-tool_env.yaml index 64fedb57..743f2ce8 100644 --- a/hot/software-config/example-templates/example-pristine-atomic-tool_env.yaml +++ b/hot/software-config/example-templates/example-pristine-atomic-tool_env.yaml @@ -1,2 +1,2 @@ resource_registry: - "Heat::InstallConfigAgent": ../boot-config/templates/install_container_agent.yaml \ No newline at end of file + "Heat::InstallConfigAgent": ../boot-config/templates/install_container_agent.yaml diff --git a/hot/software-config/example-templates/example-puppet-template.yaml b/hot/software-config/example-templates/example-puppet-template.yaml index f7c74653..65b1d811 100644 --- a/hot/software-config/example-templates/example-puppet-template.yaml +++ b/hot/software-config/example-templates/example-puppet-template.yaml @@ -84,4 +84,4 @@ outputs: get_attr: [deployment, deploy_status_code] other_result: value: - get_attr: [other_deployment, result] \ No newline at end of file + get_attr: [other_deployment, result] diff --git a/hot/software-config/example-templates/example-script-template.yaml b/hot/software-config/example-templates/example-script-template.yaml index a35c3393..370242e3 100644 --- a/hot/software-config/example-templates/example-script-template.yaml +++ b/hot/software-config/example-templates/example-script-template.yaml @@ -84,4 +84,4 @@ outputs: get_attr: [deployment, deploy_status_code] other_result: value: - get_attr: [other_deployment, result] \ No newline at end of file + get_attr: [other_deployment, result] diff --git a/hot/software-config/example-templates/example-sw-component-template.yaml b/hot/software-config/example-templates/example-sw-component-template.yaml index e3b016c2..134fe049 100644 --- a/hot/software-config/example-templates/example-sw-component-template.yaml +++ b/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 ] } - diff --git a/hot/software-config/example-templates/wordpress/WordPress_software-config_1-instance.yaml b/hot/software-config/example-templates/wordpress/WordPress_software-config_1-instance.yaml index 71a4e89c..4f37b6a8 100644 --- a/hot/software-config/example-templates/wordpress/WordPress_software-config_1-instance.yaml +++ b/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 diff --git a/hot/software-config/example-templates/wordpress/WordPress_software-config_2-instances.yaml b/hot/software-config/example-templates/wordpress/WordPress_software-config_2-instances.yaml index 9803eef8..17268f6d 100644 --- a/hot/software-config/example-templates/wordpress/WordPress_software-config_2-instances.yaml +++ b/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 diff --git a/openshift-origin/F19/hot-template/openshift-scalable-cpu-nbgears/nodeinstance.yaml b/openshift-origin/F19/hot-template/openshift-scalable-cpu-nbgears/nodeinstance.yaml index b885292c..a65e47ff 100644 --- a/openshift-origin/F19/hot-template/openshift-scalable-cpu-nbgears/nodeinstance.yaml +++ b/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} - port_id: {get_resource: node_port} + floating_network_id: {get_param: public_net_id} + 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 diff --git a/openshift-origin/F19/hot-template/openshift-scalable-cpu/nodeinstance.yaml b/openshift-origin/F19/hot-template/openshift-scalable-cpu/nodeinstance.yaml index b885292c..a65e47ff 100644 --- a/openshift-origin/F19/hot-template/openshift-scalable-cpu/nodeinstance.yaml +++ b/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} - port_id: {get_resource: node_port} + floating_network_id: {get_param: public_net_id} + 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 diff --git a/openshift-origin/F19/hot-template/openshift-scalable-nbgears/nodeinstance.yaml b/openshift-origin/F19/hot-template/openshift-scalable-nbgears/nodeinstance.yaml index f6423c79..e3fcd665 100644 --- a/openshift-origin/F19/hot-template/openshift-scalable-nbgears/nodeinstance.yaml +++ b/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} - port_id: {get_resource: node_port} + floating_network_id: {get_param: public_net_id} + 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 diff --git a/openshift-origin/F19/hot-template/openshift/openshift.yaml b/openshift-origin/F19/hot-template/openshift/openshift.yaml index fccb70c2..e57838f3 100644 --- a/openshift-origin/F19/hot-template/openshift/openshift.yaml +++ b/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} - port_id: {get_resource: node_port} + floating_network_id: {get_param: public_net_id} + 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 diff --git a/openshift-origin/centos65/OpenShift-1B1N.yaml b/openshift-origin/centos65/OpenShift-1B1N.yaml index 3f3e1654..d5b674dc 100644 --- a/openshift-origin/centos65/OpenShift-1B1N.yaml +++ b/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 ] } - diff --git a/openshift-origin/centos65/OpenShift.yaml b/openshift-origin/centos65/OpenShift.yaml index bb8f4d20..2245fa0d 100644 --- a/openshift-origin/centos65/OpenShift.yaml +++ b/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 } - diff --git a/openshift-origin/centos65/highly-available/invalid/oso_ha.yaml b/openshift-origin/centos65/highly-available/invalid/oso_ha.yaml index 804b8490..9abc49a3 100644 --- a/openshift-origin/centos65/highly-available/invalid/oso_ha.yaml +++ b/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: broker3_wait_condition + depends_on: [broker2_wait_condition, broker3_wait_condition] properties: name: oso_broker1 image: { get_param: broker_image }