Fix linting errors in YAML
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: I7f2369adfb152fd2a74b9b105e969e653e592922changes/54/276754/2
Adrien Vergé
7 years ago
parent
96a0b0b3d2
commit
2a2fe91602
@ -1,4 +1,4 @@
|
||||
# Specifies server resource which uses nova networking
|
||||
|
||||
resource_registry:
|
||||
"NovaNetwork::Server": templates/server_with_ip.yaml
|
||||
"NovaNetwork::Server": templates/server_with_ip.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 ] }
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Installs heat-container-agent on boot in a container
|
||||
|
||||
resource_registry:
|
||||
"Heat::InstallConfigAgent": templates/install_container_agent.yaml
|
||||
"Heat::InstallConfigAgent": templates/install_container_agent.yaml
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
resource_registry:
|
||||
"Heat::InstallConfigAgent": ../boot-config/templates/install_container_agent.yaml
|
||||
"Heat::InstallConfigAgent": ../boot-config/templates/install_container_agent.yaml
|
||||
|
||||
Loading…
Reference in New Issue