Skip to content

Commit

Permalink
Merge "Fix new_templates to - use V2 resources - have refs as list" i…
Browse files Browse the repository at this point in the history 
…nto R3.0
  • Loading branch information
@opencontrail-ci-admin
Zuul authored and opencontrail-ci-admin committed Apr 15, 2016
2 parents edd1cdf + 98c95c0 commit d003927
Show file tree
Hide file tree
Showing 9 changed files with 222 additions and 222 deletions.
190 changes: 95 additions & 95 deletions contrail_heat/new_templates/2svc_1instance.yaml
View file

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions contrail_heat/new_templates/servers_with_sec_group.yaml
View file
Expand Up @@ -33,18 +33,18 @@ parameters:

resources:
template_NetworkIpam:
type: OS::Contrail::NetworkIpam
type: OS::ContrailV2::NetworkIpam
properties:
name: { get_param: private_net_name }

template_VirtualNetwork:
type: OS::Contrail::VirtualNetwork
type: OS::ContrailV2::VirtualNetwork
depends_on: [ template_NetworkIpam ]
properties:
name: { get_param: private_net_name }
network_ipam_refs: { get_resource: template_NetworkIpam }
network_ipam_refs: [{ get_resource: template_NetworkIpam }]
network_ipam_refs_data:
{
[{
network_ipam_refs_data_ipam_subnets:
[{
network_ipam_refs_data_ipam_subnets_subnet:
Expand All @@ -54,35 +54,35 @@ resources:
},
network_ipam_refs_data_ipam_subnets_addr_from_start: { get_param: addr_from_start_true },
}]
}
}]

template_InstanceIp_1:
type: OS::Contrail::InstanceIp
type: OS::ContrailV2::InstanceIp
properties:
name: { get_param: port_name_1 }
virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_1 }
virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork, fq_name ] } ] }
virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_1 }]
virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork, fq_name ] } ] }]

template_VirtualMachineInterface_1:
type: OS::Contrail::VirtualMachineInterface
type: OS::ContrailV2::VirtualMachineInterface
properties:
name: { get_param: port_name_1 }
virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork, fq_name ] } ] }
security_group_refs: { list_join: [':', { get_attr: [ test_security_group, fq_name ] } ] }
virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork, fq_name ] } ] }]
security_group_refs: [{ list_join: [':', { get_attr: [ test_security_group, fq_name ] } ] }]

template_InstanceIp_2:
type: OS::Contrail::InstanceIp
type: OS::ContrailV2::InstanceIp
properties:
name: { get_param: port_name_2 }
virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_2 }
virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork, fq_name ] } ] }
virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_2 }]
virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork, fq_name ] } ] }]

template_VirtualMachineInterface_2:
type: OS::Contrail::VirtualMachineInterface
type: OS::ContrailV2::VirtualMachineInterface
properties:
name: { get_param: port_name_2 }
virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork, fq_name ] } ] }
security_group_refs: { list_join: [':', { get_attr: [ test_security_group, fq_name ] } ] }
virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork, fq_name ] } ] }]
security_group_refs: [{ list_join: [':', { get_attr: [ test_security_group, fq_name ] } ] }]

server1:
type: OS::Nova::Server
Expand All @@ -105,7 +105,7 @@ resources:
- port: { get_resource: template_VirtualMachineInterface_2 }

test_security_group:
type: OS::Contrail::SecurityGroup
type: OS::ContrailV2::SecurityGroup
properties:
name: test_security_group
security_group_entries:
Expand Down
38 changes: 19 additions & 19 deletions contrail_heat/new_templates/service_instance.yaml
View file
Expand Up @@ -47,70 +47,70 @@ parameters:

resources:
template_PortTuple:
type: OS::Contrail::PortTuple
type: OS::ContrailV2::PortTuple
properties:
name: { get_param: port_tuple_name }
service_instance: { get_param: service_instance_name }

template_VirtualMachineInterface_1:
type: OS::Contrail::VirtualMachineInterface
type: OS::ContrailV2::VirtualMachineInterface
depends_on: [ template_PortTuple ]
properties:
name: { get_param: virtual_network_1 }
virtual_machine_interface_properties:
{
virtual_machine_interface_properties_service_interface_type: { get_param: service_interface_type_1 },
}
port_tuple_refs: { get_resource: template_PortTuple }
virtual_network_refs: { get_param: virtual_network_1_fqdn }
port_tuple_refs: [{ get_resource: template_PortTuple }]
virtual_network_refs: [{ get_param: virtual_network_1_fqdn }]

template_VirtualMachineInterface_2:
type: OS::Contrail::VirtualMachineInterface
type: OS::ContrailV2::VirtualMachineInterface
depends_on: [ template_PortTuple ]
properties:
name: { get_param: virtual_network_2 }
virtual_machine_interface_properties:
{
virtual_machine_interface_properties_service_interface_type: { get_param: service_interface_type_2 },
}
port_tuple_refs: { get_resource: template_PortTuple }
virtual_network_refs: { get_param: virtual_network_2_fqdn }
port_tuple_refs: [{ get_resource: template_PortTuple }]
virtual_network_refs: [{ get_param: virtual_network_2_fqdn }]

template_VirtualMachineInterface_3:
type: OS::Contrail::VirtualMachineInterface
type: OS::ContrailV2::VirtualMachineInterface
depends_on: [ template_PortTuple ]
properties:
name: { get_param: virtual_network_3 }
virtual_machine_interface_properties:
{
virtual_machine_interface_properties_service_interface_type: { get_param: service_interface_type_3 },
}
port_tuple_refs: { get_resource: template_PortTuple }
virtual_network_refs: { get_param: virtual_network_3_fqdn }
port_tuple_refs: [{ get_resource: template_PortTuple }]
virtual_network_refs: [{ get_param: virtual_network_3_fqdn }]

template_InstanceIp_1:
type: OS::Contrail::InstanceIp
type: OS::ContrailV2::InstanceIp
depends_on: [ template_VirtualMachineInterface_1 ]
properties:
name: { get_param: virtual_network_1 }
virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_1 }
virtual_network_refs: { get_param: virtual_network_1_fqdn }
virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_1 }]
virtual_network_refs: [{ get_param: virtual_network_1_fqdn }]

template_InstanceIp_2:
type: OS::Contrail::InstanceIp
type: OS::ContrailV2::InstanceIp
depends_on: [ template_VirtualMachineInterface_2 ]
properties:
name: { get_param: virtual_network_2 }
virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_2 }
virtual_network_refs: { get_param: virtual_network_2_fqdn }
virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_2 }]
virtual_network_refs: [{ get_param: virtual_network_2_fqdn }]

template_InstanceIp_3:
type: OS::Contrail::InstanceIp
type: OS::ContrailV2::InstanceIp
depends_on: [ template_VirtualMachineInterface_3 ]
properties:
name: { get_param: virtual_network_3 }
virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_3 }
virtual_network_refs: { get_param: virtual_network_3_fqdn }
virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_3 }]
virtual_network_refs: [{ get_param: virtual_network_3_fqdn }]

instance:
type: OS::Nova::Server
Expand Down
36 changes: 18 additions & 18 deletions contrail_heat/new_templates/service_instance_scaling.yaml
View file
Expand Up @@ -154,28 +154,28 @@ parameters:

resources:
template_NetworkIpam_1:
type: OS::Contrail::NetworkIpam
type: OS::ContrailV2::NetworkIpam
properties:
name: { get_param: management_network }

template_NetworkIpam_2:
type: OS::Contrail::NetworkIpam
type: OS::ContrailV2::NetworkIpam
properties:
name: { get_param: left_network }

template_NetworkIpam_3:
type: OS::Contrail::NetworkIpam
type: OS::ContrailV2::NetworkIpam
properties:
name: { get_param: right_network }

template_VirtualNetwork_1:
type: OS::Contrail::VirtualNetwork
type: OS::ContrailV2::VirtualNetwork
depends_on: [ template_NetworkIpam_1 ]
properties:
name: { get_param: management_network }
network_ipam_refs: { get_resource: template_NetworkIpam_1 }
network_ipam_refs: [{ get_resource: template_NetworkIpam_1 }]
network_ipam_refs_data:
{
[{
network_ipam_refs_data_ipam_subnets:
[{
network_ipam_refs_data_ipam_subnets_subnet:
Expand All @@ -184,16 +184,16 @@ resources:
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len: { get_param: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_1 },
},
}]
}
}]

template_VirtualNetwork_2:
type: OS::Contrail::VirtualNetwork
type: OS::ContrailV2::VirtualNetwork
depends_on: [ template_NetworkIpam_2 ]
properties:
name: { get_param: left_network }
network_ipam_refs: { get_resource: template_NetworkIpam_2 }
network_ipam_refs: [{ get_resource: template_NetworkIpam_2 }]
network_ipam_refs_data:
{
[{
network_ipam_refs_data_ipam_subnets:
[{
network_ipam_refs_data_ipam_subnets_subnet:
Expand All @@ -202,16 +202,16 @@ resources:
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len: { get_param: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2 },
},
}]
}
}]

template_VirtualNetwork_3:
type: OS::Contrail::VirtualNetwork
type: OS::ContrailV2::VirtualNetwork
depends_on: [ template_NetworkIpam_3 ]
properties:
name: { get_param: right_network }
network_ipam_refs: { get_resource: template_NetworkIpam_3 }
network_ipam_refs: [{ get_resource: template_NetworkIpam_3 }]
network_ipam_refs_data:
{
[{
network_ipam_refs_data_ipam_subnets:
[{
network_ipam_refs_data_ipam_subnets_subnet:
Expand All @@ -220,10 +220,10 @@ resources:
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len: { get_param: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_3 },
},
}]
}
}]

template_ServiceTemplate:
type: OS::Contrail::ServiceTemplate
type: OS::ContrailV2::ServiceTemplate
properties:
name: { get_param: service_template_name }
service_template_properties:
Expand Down Expand Up @@ -259,7 +259,7 @@ resources:
domain: { get_param: domain }

template_ServiceInstance:
type: OS::Contrail::ServiceInstance
type: OS::ContrailV2::ServiceInstance
depends_on: [ template_ServiceTemplate ]
properties:
name: { get_param: service_instance_name }
Expand Down Expand Up @@ -311,7 +311,7 @@ resources:
}
],
}
service_template_refs: { get_resource: template_ServiceTemplate }
service_template_refs: [{ get_resource: template_ServiceTemplate }]

instance_group:
type: OS::Heat::AutoScalingGroup
Expand Down

0 comments on commit d003927

Please sign in to comment.