diff options
author | Marco Platania <platania@research.att.com> | 2017-10-18 13:49:43 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2017-10-18 13:49:43 +0000 |
commit | 3d555796e00cf21ed3f1e2f878f2e5bc221980be (patch) | |
tree | 82435e7e50ddbe2e6f21d3c57300c8b398255115 | |
parent | 92585cab04fa7f08bcfee3a6dcaefcc3d886c0e5 (diff) | |
parent | 1921e5a7773323ac64f0a827e239e4a38b3914c1 (diff) |
Merge "Fix naming conflict in vLB/vDNS Heat template"
-rw-r--r-- | heat/vLB/dnsscaling.yaml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/heat/vLB/dnsscaling.yaml b/heat/vLB/dnsscaling.yaml index 20718276..60f8bacf 100644 --- a/heat/vLB/dnsscaling.yaml +++ b/heat/vLB/dnsscaling.yaml @@ -147,19 +147,19 @@ resources: public_key: { get_param: pub_key } save_private_key: false - vdns_private_0_port: + vdns_2_private_0_port: type: OS::Neutron::Port properties: network: { get_param: vlb_private_net_id } fixed_ips: [{"subnet": { get_param: vlb_private_net_id }, "ip_address": { get_param: vdns_private_ip_0 }}] - vdns_private_1_port: + vdns_2_private_1_port: type: OS::Neutron::Port properties: network: { get_param: onap_private_net_id } fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vdns_private_ip_1 }}] - vdns_0: + vdns_2: type: OS::Nova::Server properties: image: { get_param: vlb_image_name } @@ -168,8 +168,8 @@ resources: key_name: { get_resource: my_keypair } networks: - network: { get_param: public_net_id } - - port: { get_resource: vdns_private_0_port } - - port: { get_resource: vdns_private_1_port } + - port: { get_resource: vdns_2_private_0_port } + - port: { get_resource: vdns_2_private_1_port } metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }} user_data_format: RAW user_data: |