Run dos2unix over template files
Remove DOS line-endings (CRLF) from templates. Change-Id: I667e7d5a7ace744949e8b7acf0060381c21a0775
This commit is contained in:
Zane Bitter
parent
1333b29342
commit
6978327789
|
|
@ -1,62 +1,62 @@
|
|||
heat_template_version: 2013-05-23
|
||||
|
||||
description: >
|
||||
A template showing how to create a Nova instance, a Cinder volume and attach
|
||||
the volume to the instance. The template uses only Heat OpenStack native
|
||||
resource types.
|
||||
|
||||
parameters:
|
||||
key_name:
|
||||
type: string
|
||||
description:
|
||||
Name of an existing key pair to enable SSH access to the instance.
|
||||
instance_type:
|
||||
type: string
|
||||
description: Type of the instance to be created.
|
||||
default: m1.small
|
||||
constraints:
|
||||
- allowed_values: [m1.small, m1.medium, m1.large]
|
||||
description:
|
||||
Value must be one of 'm1.small', 'm1.medium' or 'm1.large'.
|
||||
image_id:
|
||||
type: string
|
||||
description: ID of the image to use for the instance to be created.
|
||||
default: F18-x86_64-cfntools
|
||||
constraints:
|
||||
- allowed_values: [ F18-i386-cfntools, F18-x86_64-cfntools ]
|
||||
description:
|
||||
Image ID must be either F18-i386-cfntools or F18-x86_64-cfntools.
|
||||
availability_zone:
|
||||
type: String
|
||||
description: The Availability Zone to launch the instance.
|
||||
default: nova
|
||||
volume_size:
|
||||
type: Number
|
||||
description: Size of the volume to be created.
|
||||
default: 1
|
||||
constraints:
|
||||
- range: { min: 1, max: 1024 }
|
||||
description: must be between 1 and 1024 Gb.
|
||||
resources:
|
||||
nova_instance:
|
||||
type: OS::Nova::Server
|
||||
properties:
|
||||
availability_zone: { get_param: availability_zone }
|
||||
image: { get_param: image_id }
|
||||
flavor: { get_param: instance_type }
|
||||
key_name: { get_param: key_name }
|
||||
cinder_volume:
|
||||
type: OS::Cinder::Volume
|
||||
properties:
|
||||
size: { get_param: volume_size }
|
||||
availability_zone: { get_param: availability_zone }
|
||||
volume_attachment:
|
||||
type: OS::Cinder::VolumeAttachment
|
||||
properties:
|
||||
volume_id: { get_resource: cinder_volume }
|
||||
instance_uuid: { get_resource: nova_instance }
|
||||
mountpoint: /dev/vdc
|
||||
outputs:
|
||||
instance_ip:
|
||||
description: Public IP address of the newly created Nova instance.
|
||||
value: { get_attr: [nova_instance, first_address] }
|
||||
heat_template_version: 2013-05-23
|
||||
|
||||
description: >
|
||||
A template showing how to create a Nova instance, a Cinder volume and attach
|
||||
the volume to the instance. The template uses only Heat OpenStack native
|
||||
resource types.
|
||||
|
||||
parameters:
|
||||
key_name:
|
||||
type: string
|
||||
description:
|
||||
Name of an existing key pair to enable SSH access to the instance.
|
||||
instance_type:
|
||||
type: string
|
||||
description: Type of the instance to be created.
|
||||
default: m1.small
|
||||
constraints:
|
||||
- allowed_values: [m1.small, m1.medium, m1.large]
|
||||
description:
|
||||
Value must be one of 'm1.small', 'm1.medium' or 'm1.large'.
|
||||
image_id:
|
||||
type: string
|
||||
description: ID of the image to use for the instance to be created.
|
||||
default: F18-x86_64-cfntools
|
||||
constraints:
|
||||
- allowed_values: [ F18-i386-cfntools, F18-x86_64-cfntools ]
|
||||
description:
|
||||
Image ID must be either F18-i386-cfntools or F18-x86_64-cfntools.
|
||||
availability_zone:
|
||||
type: String
|
||||
description: The Availability Zone to launch the instance.
|
||||
default: nova
|
||||
volume_size:
|
||||
type: Number
|
||||
description: Size of the volume to be created.
|
||||
default: 1
|
||||
constraints:
|
||||
- range: { min: 1, max: 1024 }
|
||||
description: must be between 1 and 1024 Gb.
|
||||
resources:
|
||||
nova_instance:
|
||||
type: OS::Nova::Server
|
||||
properties:
|
||||
availability_zone: { get_param: availability_zone }
|
||||
image: { get_param: image_id }
|
||||
flavor: { get_param: instance_type }
|
||||
key_name: { get_param: key_name }
|
||||
cinder_volume:
|
||||
type: OS::Cinder::Volume
|
||||
properties:
|
||||
size: { get_param: volume_size }
|
||||
availability_zone: { get_param: availability_zone }
|
||||
volume_attachment:
|
||||
type: OS::Cinder::VolumeAttachment
|
||||
properties:
|
||||
volume_id: { get_resource: cinder_volume }
|
||||
instance_uuid: { get_resource: nova_instance }
|
||||
mountpoint: /dev/vdc
|
||||
outputs:
|
||||
instance_ip:
|
||||
description: Public IP address of the newly created Nova instance.
|
||||
value: { get_attr: [nova_instance, first_address] }
|
||||
|
|
|
|||
|
|
@ -1,88 +1,88 @@
|
|||
heat_template_version: 2013-05-23
|
||||
|
||||
description: >
|
||||
HOT template to deploy two servers into an existing neutron tenant network and
|
||||
assign floating IP addresses to each server so they are routable from the
|
||||
public 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
|
||||
public_net_id:
|
||||
type: string
|
||||
description: >
|
||||
ID of public network for which floating IP addresses will be allocated
|
||||
private_net_id:
|
||||
type: string
|
||||
description: ID of private network into which servers get deployed
|
||||
private_subnet_id:
|
||||
type: string
|
||||
description: ID of private 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: private_net_id }
|
||||
fixed_ips:
|
||||
- subnet_id: { get_param: private_subnet_id }
|
||||
|
||||
server1_floating_ip:
|
||||
type: OS::Neutron::FloatingIP
|
||||
properties:
|
||||
floating_network_id: { get_param: public_net_id }
|
||||
port_id: { get_resource: server1_port }
|
||||
|
||||
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: private_net_id }
|
||||
fixed_ips:
|
||||
- subnet_id: { get_param: private_subnet_id }
|
||||
|
||||
server2_floating_ip:
|
||||
type: OS::Neutron::FloatingIP
|
||||
properties:
|
||||
floating_network_id: { get_param: public_net_id }
|
||||
port_id: { get_resource: server2_port }
|
||||
|
||||
outputs:
|
||||
server1_private_ip:
|
||||
description: IP address of server1 in private network
|
||||
value: { get_attr: [ server1, first_address ] }
|
||||
server1_public_ip:
|
||||
description: Floating IP address of server1 in public network
|
||||
value: { get_attr: [ server1_floating_ip, floating_ip_address ] }
|
||||
server2_private_ip:
|
||||
description: IP address of server2 in private network
|
||||
value: { get_attr: [ server2, first_address ] }
|
||||
server2_public_ip:
|
||||
description: Floating IP address of server2 in public network
|
||||
value: { get_attr: [ server2_floating_ip, floating_ip_address ] }
|
||||
heat_template_version: 2013-05-23
|
||||
|
||||
description: >
|
||||
HOT template to deploy two servers into an existing neutron tenant network and
|
||||
assign floating IP addresses to each server so they are routable from the
|
||||
public 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
|
||||
public_net_id:
|
||||
type: string
|
||||
description: >
|
||||
ID of public network for which floating IP addresses will be allocated
|
||||
private_net_id:
|
||||
type: string
|
||||
description: ID of private network into which servers get deployed
|
||||
private_subnet_id:
|
||||
type: string
|
||||
description: ID of private 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: private_net_id }
|
||||
fixed_ips:
|
||||
- subnet_id: { get_param: private_subnet_id }
|
||||
|
||||
server1_floating_ip:
|
||||
type: OS::Neutron::FloatingIP
|
||||
properties:
|
||||
floating_network_id: { get_param: public_net_id }
|
||||
port_id: { get_resource: server1_port }
|
||||
|
||||
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: private_net_id }
|
||||
fixed_ips:
|
||||
- subnet_id: { get_param: private_subnet_id }
|
||||
|
||||
server2_floating_ip:
|
||||
type: OS::Neutron::FloatingIP
|
||||
properties:
|
||||
floating_network_id: { get_param: public_net_id }
|
||||
port_id: { get_resource: server2_port }
|
||||
|
||||
outputs:
|
||||
server1_private_ip:
|
||||
description: IP address of server1 in private network
|
||||
value: { get_attr: [ server1, first_address ] }
|
||||
server1_public_ip:
|
||||
description: Floating IP address of server1 in public network
|
||||
value: { get_attr: [ server1_floating_ip, floating_ip_address ] }
|
||||
server2_private_ip:
|
||||
description: IP address of server2 in private network
|
||||
value: { get_attr: [ server2, first_address ] }
|
||||
server2_public_ip:
|
||||
description: Floating IP address of server2 in public network
|
||||
value: { get_attr: [ server2_floating_ip, floating_ip_address ] }
|
||||
|
|
|
|||
|
|
@ -1,128 +1,128 @@
|
|||
heat_template_version: 2013-05-23
|
||||
|
||||
description: >
|
||||
HOT template to create a new neutron network plus a router to the public
|
||||
network, and for deploying two servers into the new network. The template also
|
||||
assigns floating IP addresses to each server so they are routable from the
|
||||
public 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
|
||||
public_net_id:
|
||||
type: string
|
||||
description: >
|
||||
ID of public network for which floating IP addresses will be allocated
|
||||
private_net_name:
|
||||
type: string
|
||||
description: Name of private network to be created
|
||||
private_net_cidr:
|
||||
type: string
|
||||
description: Private network address (CIDR notation)
|
||||
private_net_gateway:
|
||||
type: string
|
||||
description: Private network gateway address
|
||||
private_net_pool_start:
|
||||
type: string
|
||||
description: Start of private network IP address allocation pool
|
||||
private_net_pool_end:
|
||||
type: string
|
||||
description: End of private network IP address allocation pool
|
||||
|
||||
resources:
|
||||
private_net:
|
||||
type: OS::Neutron::Net
|
||||
properties:
|
||||
name: { get_param: private_net_name }
|
||||
|
||||
private_subnet:
|
||||
type: OS::Neutron::Subnet
|
||||
properties:
|
||||
network_id: { get_resource: private_net }
|
||||
cidr: { get_param: private_net_cidr }
|
||||
gateway_ip: { get_param: private_net_gateway }
|
||||
allocation_pools:
|
||||
- start: { get_param: private_net_pool_start }
|
||||
end: { get_param: private_net_pool_end }
|
||||
|
||||
router:
|
||||
type: OS::Neutron::Router
|
||||
|
||||
router_gateway:
|
||||
type: OS::Neutron::RouterGateway
|
||||
properties:
|
||||
router_id: { get_resource: router }
|
||||
network_id: { get_param: public_net_id }
|
||||
|
||||
router_interface:
|
||||
type: OS::Neutron::RouterInterface
|
||||
properties:
|
||||
router_id: { get_resource: router }
|
||||
subnet_id: { get_resource: private_subnet }
|
||||
|
||||
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_resource: private_net }
|
||||
fixed_ips:
|
||||
- subnet_id: { get_resource: private_subnet }
|
||||
|
||||
server1_floating_ip:
|
||||
type: OS::Neutron::FloatingIP
|
||||
properties:
|
||||
floating_network_id: { get_param: public_net_id }
|
||||
port_id: { get_resource: server1_port }
|
||||
|
||||
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_resource: private_net }
|
||||
fixed_ips:
|
||||
- subnet_id: { get_resource: private_subnet }
|
||||
|
||||
server2_floating_ip:
|
||||
type: OS::Neutron::FloatingIP
|
||||
properties:
|
||||
floating_network_id: { get_param: public_net_id }
|
||||
port_id: { get_resource: server2_port }
|
||||
|
||||
outputs:
|
||||
server1_private_ip:
|
||||
description: IP address of server1 in private network
|
||||
value: { get_attr: [ server1, first_address ] }
|
||||
server1_public_ip:
|
||||
description: Floating IP address of server1 in public network
|
||||
value: { get_attr: [ server1_floating_ip, floating_ip_address ] }
|
||||
server2_private_ip:
|
||||
description: IP address of server2 in private network
|
||||
value: { get_attr: [ server2, first_address ] }
|
||||
server2_public_ip:
|
||||
description: Floating IP address of server2 in public network
|
||||
value: { get_attr: [ server2_floating_ip, floating_ip_address ] }
|
||||
heat_template_version: 2013-05-23
|
||||
|
||||
description: >
|
||||
HOT template to create a new neutron network plus a router to the public
|
||||
network, and for deploying two servers into the new network. The template also
|
||||
assigns floating IP addresses to each server so they are routable from the
|
||||
public 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
|
||||
public_net_id:
|
||||
type: string
|
||||
description: >
|
||||
ID of public network for which floating IP addresses will be allocated
|
||||
private_net_name:
|
||||
type: string
|
||||
description: Name of private network to be created
|
||||
private_net_cidr:
|
||||
type: string
|
||||
description: Private network address (CIDR notation)
|
||||
private_net_gateway:
|
||||
type: string
|
||||
description: Private network gateway address
|
||||
private_net_pool_start:
|
||||
type: string
|
||||
description: Start of private network IP address allocation pool
|
||||
private_net_pool_end:
|
||||
type: string
|
||||
description: End of private network IP address allocation pool
|
||||
|
||||
resources:
|
||||
private_net:
|
||||
type: OS::Neutron::Net
|
||||
properties:
|
||||
name: { get_param: private_net_name }
|
||||
|
||||
private_subnet:
|
||||
type: OS::Neutron::Subnet
|
||||
properties:
|
||||
network_id: { get_resource: private_net }
|
||||
cidr: { get_param: private_net_cidr }
|
||||
gateway_ip: { get_param: private_net_gateway }
|
||||
allocation_pools:
|
||||
- start: { get_param: private_net_pool_start }
|
||||
end: { get_param: private_net_pool_end }
|
||||
|
||||
router:
|
||||
type: OS::Neutron::Router
|
||||
|
||||
router_gateway:
|
||||
type: OS::Neutron::RouterGateway
|
||||
properties:
|
||||
router_id: { get_resource: router }
|
||||
network_id: { get_param: public_net_id }
|
||||
|
||||
router_interface:
|
||||
type: OS::Neutron::RouterInterface
|
||||
properties:
|
||||
router_id: { get_resource: router }
|
||||
subnet_id: { get_resource: private_subnet }
|
||||
|
||||
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_resource: private_net }
|
||||
fixed_ips:
|
||||
- subnet_id: { get_resource: private_subnet }
|
||||
|
||||
server1_floating_ip:
|
||||
type: OS::Neutron::FloatingIP
|
||||
properties:
|
||||
floating_network_id: { get_param: public_net_id }
|
||||
port_id: { get_resource: server1_port }
|
||||
|
||||
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_resource: private_net }
|
||||
fixed_ips:
|
||||
- subnet_id: { get_resource: private_subnet }
|
||||
|
||||
server2_floating_ip:
|
||||
type: OS::Neutron::FloatingIP
|
||||
properties:
|
||||
floating_network_id: { get_param: public_net_id }
|
||||
port_id: { get_resource: server2_port }
|
||||
|
||||
outputs:
|
||||
server1_private_ip:
|
||||
description: IP address of server1 in private network
|
||||
value: { get_attr: [ server1, first_address ] }
|
||||
server1_public_ip:
|
||||
description: Floating IP address of server1 in public network
|
||||
value: { get_attr: [ server1_floating_ip, floating_ip_address ] }
|
||||
server2_private_ip:
|
||||
description: IP address of server2 in private network
|
||||
value: { get_attr: [ server2, first_address ] }
|
||||
server2_public_ip:
|
||||
description: Floating IP address of server2 in public network
|
||||
value: { get_attr: [ server2_floating_ip, floating_ip_address ] }
|
||||
|
|
|
|||
Loading…
Reference in New Issue