openstack
/
heat-templates
Code Issues Proposed changes

Merge "Fix linting errors in YAML"

This commit is contained in:
Jenkins 2016-04-06 05:55:28 +00:00 committed by Gerrit Code Review
parent bf577ef59e 2a2fe91602
commit cdd4d654ce
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] - Fn::GetAtt: [WebServer, PublicIp]
- /wordpress - /wordpress
Description: URL for Wordpress service 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] - Fn::GetAtt: [WikiDatabase, PublicIp]
- /wordpress - /wordpress
Description: URL for Wordpress wiki Description: URL for Wordpress wiki

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

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

7
cfn/F18/WordPress_NoKey.yaml
View File

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

7
cfn/F19/WordPress_NoKey.yaml
View File

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

2
cfn/deb/MultiNode_DevStack.yaml
View File

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

2
hot/F18/WordPress_Native.yaml
View File

@ -11,7 +11,7 @@ parameters:
key_name: key_name:
type: string 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: instance_type:
type: string type: string
description: Instance type for WordPress server description: Instance type for WordPress server

4
hot/F18/WordPress_NoKey.yaml
View File

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

2
hot/F20/WordPress_2_Instances.yaml
View File

@ -11,7 +11,7 @@ parameters:
key_name: key_name:
type: string 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 default: test_key
instance_type: instance_type:

2
hot/F20/WordPress_Native.yaml
View File

@ -11,7 +11,7 @@ parameters:
key_name: key_name:
type: string 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: instance_type:
type: string type: string
description: Instance type for WordPress server description: Instance type for WordPress server

2
hot/Windows/ActiveDirectoryController/ActiveDirectoryDomainController.yaml
View File

@ -29,7 +29,7 @@ parameters:
constraints: constraints:
- length: { min: 3, max: 256 } - length: { min: 3, max: 256 }
- allowed_pattern: "[A-Za-z0-9]+(?=[\\.\\-][a-zA-Z0-9])*\\.[a-zA-z09]+" - 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: domain_netbios_name:
default: cloudbase default: cloudbase

4
hot/chef-server.yaml
View File

@ -5,7 +5,7 @@ description: Heat template to deploy Open Source CHEF server on a VM
parameters: parameters:
ssh_key_name: ssh_key_name:
type: string 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: chef_image_name:
type: string type: string
@ -34,7 +34,7 @@ parameters:
- length: { min: 1, max: 25 } - length: { min: 1, max: 25 }
description: Password MUST be between 1 - 25 characters. description: Password MUST be between 1 - 25 characters.
- allowed_pattern: "[a-zA-Z0-9]*" - allowed_pattern: "[a-zA-Z0-9]*"
description : Only Alpha-Numeric characters are allowed. description: Only Alpha-Numeric characters are allowed.
resources: resources:
ChefServer: ChefServer:

2
hot/keystone/keystone.yaml
View File

@ -54,4 +54,4 @@ outputs:
test_project_a_id: test_project_a_id:
value: {get_resource: test_project_a} value: {get_resource: test_project_a}
test_role_a_id: test_role_a_id:
value: {get_resource: test_role_a} value: {get_resource: test_role_a}

2
hot/keystone/keystone_group.yaml
View File

@ -38,4 +38,4 @@ resources:
outputs: outputs:
admin_group_id: admin_group_id:
value: {get_resource: admin_group} value: {get_resource: admin_group}

1
hot/keystone/keystone_project.yaml
View File

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

1
hot/keystone/keystone_region.yaml
View File

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

2
hot/keystone/keystone_role.yaml
View File

@ -16,4 +16,4 @@ resources:
outputs: outputs:
sample_role_id: sample_role_id:
value: {get_resource: sample_role} value: {get_resource: sample_role}
description: Sample keystone role identifier description: Sample keystone role identifier

1
hot/keystone/keystone_service_endpoint.yaml
View File

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

2
hot/keystone/keystone_updated.yaml
View File

@ -80,4 +80,4 @@ outputs:
test_role_a_id: test_role_a_id:
value: {get_resource: test_role_a} value: {get_resource: test_role_a}
test_role_b_id: test_role_b_id:
value: {get_resource: test_role_b} value: {get_resource: test_role_b}

2
hot/keystone/keystone_user.yaml
View File

@ -56,4 +56,4 @@ resources:
project: {get_param: group_role_project} project: {get_param: group_role_project}
outputs: outputs:
admin_user_id: admin_user_id:
value: {get_resource: admin_user} value: {get_resource: admin_user}

2
hot/mistral/nova_networking_server_with_ip_env.yaml
View File

@ -1,4 +1,4 @@
# Specifies server resource which uses nova networking # Specifies server resource which uses nova networking
resource_registry: resource_registry:
"NovaNetwork::Server": templates/server_with_ip.yaml "NovaNetwork::Server": templates/server_with_ip.yaml

4
hot/mistral/templates/server_with_ip.yaml
View File

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

2
hot/monasca/autoscaling.yaml
View File

@ -84,4 +84,4 @@ resources:
scale_group_id: {get_param: "OS::stack_id"} scale_group_id: {get_param: "OS::stack_id"}
severity: low severity: low
alarm_actions: alarm_actions:
- {get_resource: down_notification} - {get_resource: down_notification}

1
hot/server_with_encrpyted_volume.yaml
View File

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

156
hot/servers_in_existing_neutron_network_no_floating_ips.yaml
View File

@ -1,78 +1,78 @@
heat_template_version: 2013-05-23 heat_template_version: 2013-05-23
description: HOT template to deploy two servers to an existing Neutron network. description: HOT template to deploy two servers to an existing Neutron network.
parameters: parameters:
key_name: key_name:
type: string type: string
description: Name of keypair to assign to servers description: Name of keypair to assign to servers
image: image:
type: string type: string
description: Name of image to use for servers description: Name of image to use for servers
flavor: flavor:
type: string type: string
description: Flavor to use for servers description: Flavor to use for servers
net_id: net_id:
type: string type: string
description: ID of Neutron network into which servers get deployed description: ID of Neutron network into which servers get deployed
subnet_id: subnet_id:
type: string type: string
description: ID of Neutron sub network into which servers get deployed description: ID of Neutron sub network into which servers get deployed
resources: resources:
server1: server1:
type: OS::Nova::Server type: OS::Nova::Server
properties: properties:
name: Server1 name: Server1
image: { get_param: image } image: { get_param: image }
flavor: { get_param: flavor } flavor: { get_param: flavor }
key_name: { get_param: key_name } key_name: { get_param: key_name }
networks: networks:
- port: { get_resource: server1_port } - port: { get_resource: server1_port }
server1_port: server1_port:
type: OS::Neutron::Port type: OS::Neutron::Port
properties: properties:
network_id: { get_param: net_id } network_id: { get_param: net_id }
fixed_ips: fixed_ips:
- subnet_id: { get_param: subnet_id } - subnet_id: { get_param: subnet_id }
security_groups: [{ get_resource: server_security_group }] security_groups: [{ get_resource: server_security_group }]
server2: server2:
type: OS::Nova::Server type: OS::Nova::Server
properties: properties:
name: Server2 name: Server2
image: { get_param: image } image: { get_param: image }
flavor: { get_param: flavor } flavor: { get_param: flavor }
key_name: { get_param: key_name } key_name: { get_param: key_name }
networks: networks:
- port: { get_resource: server2_port } - port: { get_resource: server2_port }
server2_port: server2_port:
type: OS::Neutron::Port type: OS::Neutron::Port
properties: properties:
network_id: { get_param: net_id } network_id: { get_param: net_id }
fixed_ips: fixed_ips:
- subnet_id: { get_param: subnet_id } - subnet_id: { get_param: subnet_id }
security_groups: [{ get_resource: server_security_group }] security_groups: [{ get_resource: server_security_group }]
server_security_group: server_security_group:
type: OS::Neutron::SecurityGroup type: OS::Neutron::SecurityGroup
properties: properties:
description: Test group to demonstrate Neutron security group functionality with Heat. description: Test group to demonstrate Neutron security group functionality with Heat.
name: test-security-group name: test-security-group
rules: [ rules: [
{remote_ip_prefix: 0.0.0.0/0, {remote_ip_prefix: 0.0.0.0/0,
protocol: tcp, protocol: tcp,
port_range_min: 22, port_range_min: 22,
port_range_max: 22}, port_range_max: 22},
{remote_ip_prefix: 0.0.0.0/0, {remote_ip_prefix: 0.0.0.0/0,
protocol: icmp}] protocol: icmp}]
outputs: outputs:
server1_provider_ip: server1_provider_ip:
description: IP address of server1 in provider network description: IP address of server1 in provider network
value: { get_attr: [ server1, first_address ] } value: { get_attr: [ server1, first_address ] }
server2_provider_ip: server2_provider_ip:
description: IP address of server2 in provider network description: IP address of server2 in provider network
value: { get_attr: [ server2, first_address ] } value: { get_attr: [ server2, first_address ] }

2
hot/software-config/boot-config/container_agent_env.yaml
View File

@ -1,4 +1,4 @@
# Installs heat-container-agent on boot in a container # Installs heat-container-agent on boot in a container
resource_registry: resource_registry:
"Heat::InstallConfigAgent": templates/install_container_agent.yaml "Heat::InstallConfigAgent": templates/install_container_agent.yaml

2
hot/software-config/boot-config/fedora_pip_env.yaml
View File

@ -4,4 +4,4 @@ parameters:
image: Fedora-x86_64-20-20140618-sda image: Fedora-x86_64-20-20140618-sda
resource_registry: resource_registry:
"Heat::InstallConfigAgent": templates/install_config_agent_fedora_pip.yaml "Heat::InstallConfigAgent": templates/install_config_agent_fedora_pip.yaml

2
hot/software-config/boot-config/fedora_yum_env.yaml
View File

@ -4,4 +4,4 @@ parameters:
image: Fedora-x86_64-20-20140618-sda image: Fedora-x86_64-20-20140618-sda
resource_registry: resource_registry:
"Heat::InstallConfigAgent": templates/install_config_agent_fedora_yum.yaml "Heat::InstallConfigAgent": templates/install_config_agent_fedora_yum.yaml

2
hot/software-config/boot-config/none_env.yaml
View File

@ -2,4 +2,4 @@
# This environment can be used when the image already has the required agents # This environment can be used when the image already has the required agents
# installed and configured. # installed and configured.
resource_registry: resource_registry:
"Heat::InstallConfigAgent": "OS::Heat::SoftwareConfig" "Heat::InstallConfigAgent": "OS::Heat::SoftwareConfig"

2
hot/software-config/boot-config/templates/install_container_agent.yaml
View File

@ -30,4 +30,4 @@ resources:
- config: {get_resource: install_container_agent} - config: {get_resource: install_container_agent}
outputs: outputs:
config: config:
value: {get_resource: node_init} value: {get_resource: node_init}

2
hot/software-config/boot-config/test_image_env.yaml
View File

@ -7,4 +7,4 @@
# test image to work with this environment # test image to work with this environment
resource_registry: resource_registry:
"Heat::InstallConfigAgent": templates/install_config_agent_test_image.yaml "Heat::InstallConfigAgent": templates/install_config_agent_test_image.yaml

2
hot/software-config/boot-config/ubuntu_pip_env.yaml
View File

@ -4,4 +4,4 @@ parameters:
image: trusty-server-cloudimg-amd64-disk1 image: trusty-server-cloudimg-amd64-disk1
resource_registry: resource_registry:
"Heat::InstallConfigAgent": templates/install_config_agent_ubuntu_pip.yaml "Heat::InstallConfigAgent": templates/install_config_agent_ubuntu_pip.yaml

2
hot/software-config/example-templates/config-scripts/example-docker-compose.yml
View File

@ -3,4 +3,4 @@ busybox:
image: busybox image: busybox
command: ['nc', '-p', '8080', '-l', '-l', '-e', 'echo', 'hello world!'] command: ['nc', '-p', '8080', '-l', '-l', '-e', 'echo', 'hello world!']
ports: ports:
- 8080:8080 - 8080:8080

2
hot/software-config/example-templates/example-config-pristine-image.yaml
View File

@ -119,4 +119,4 @@ outputs:
get_attr: [deployment, deploy_status_code] get_attr: [deployment, deploy_status_code]
other_result: other_result:
value: value:
get_attr: [other_deployment, result] get_attr: [other_deployment, result]

2
hot/software-config/example-templates/example-config-pristine-image_env.yaml
View File

@ -5,4 +5,4 @@
# See heat-templates/hot/software-config/boot-config for environments # See heat-templates/hot/software-config/boot-config for environments
# for different distros and install methods # for different distros and install methods
resource_registry: resource_registry:
"Heat::InstallConfigAgent": "OS::Heat::SoftwareConfig" "Heat::InstallConfigAgent": "OS::Heat::SoftwareConfig"

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

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

2
hot/software-config/example-templates/example-pristine-atomic-docker-compose_env.yaml
View File

@ -3,4 +3,4 @@
# installed and configured. # installed and configured.
# #
resource_registry: resource_registry:
"Heat::InstallConfigAgent": "OS::Heat::SoftwareConfig" "Heat::InstallConfigAgent": "OS::Heat::SoftwareConfig"

2
hot/software-config/example-templates/example-pristine-atomic-tool_env.yaml
View File

@ -1,2 +1,2 @@
resource_registry: resource_registry:
"Heat::InstallConfigAgent": ../boot-config/templates/install_container_agent.yaml "Heat::InstallConfigAgent": ../boot-config/templates/install_container_agent.yaml

2
hot/software-config/example-templates/example-puppet-template.yaml
View File

@ -84,4 +84,4 @@ outputs:
get_attr: [deployment, deploy_status_code] get_attr: [deployment, deploy_status_code]
other_result: other_result:
value: value:
get_attr: [other_deployment, result] get_attr: [other_deployment, result]

2
hot/software-config/example-templates/example-script-template.yaml
View File

@ -84,4 +84,4 @@ outputs:
get_attr: [deployment, deploy_status_code] get_attr: [deployment, deploy_status_code]
other_result: other_result:
value: value:
get_attr: [other_deployment, result] get_attr: [other_deployment, result]

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 ] } value: { get_attr: [ server, networks, private, 0 ] }
sw_component_last_action: sw_component_last_action:
value: { get_attr: [ sw_deployment, last_action ] } value: { get_attr: [ sw_deployment, last_action ] }

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

@ -18,7 +18,7 @@ description: >
parameters: parameters:
key_name: key_name:
type: string 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 default: default
flavor: flavor:
type: string type: string

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

@ -18,7 +18,7 @@ description: >
parameters: parameters:
key_name: key_name:
type: string 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 default: default
flavor: flavor:
type: string type: string

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

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

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

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

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

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

12
openshift-origin/F19/hot-template/openshift/openshift.yaml
View File

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

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

@ -156,4 +156,3 @@ resources:
$dns_server$: { get_param: dns_server } $dns_server$: { get_param: dns_server }
$dns_sec_key$: { get_attr: [ broker_wait_condition, Data ] } $dns_sec_key$: { get_attr: [ broker_wait_condition, Data ] }
$broker_ip$: { get_attr: [ OpenShiftBroker, first_address ] } $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 } $dns_server$: { get_param: dns_server }
$user_name$: { get_param: user_name } $user_name$: { get_param: user_name }
$password$: { get_param: password } $password$: { get_param: password }

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

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