From 9ab263457a4b8846119b63851fbd03ab884751d6 Mon Sep 17 00:00:00 2001 From: jf9860 Date: Tue, 28 Feb 2017 15:07:36 -0500 Subject: New HEAT and preload templates Change-Id: I6314b502e03a9e7ad6693dbf3c3edd9b25590183 Signed-off-by: jf9860 --- robot/assets/templates/sdnc/dnsscaling_preload.template | 16 ++++++---------- robot/assets/templates/sdnc/vfw_preload.template | 16 ++++++---------- robot/assets/templates/sdnc/vlb_preload.template | 16 ++++++---------- 3 files changed, 18 insertions(+), 30 deletions(-) (limited to 'robot/assets/templates') diff --git a/robot/assets/templates/sdnc/dnsscaling_preload.template b/robot/assets/templates/sdnc/dnsscaling_preload.template index cf988d5b..278ee80d 100644 --- a/robot/assets/templates/sdnc/dnsscaling_preload.template +++ b/robot/assets/templates/sdnc/dnsscaling_preload.template @@ -15,16 +15,16 @@ }, "vnf-parameters": [ { - "vnf-parameter-name": "repo_url", - "vnf-parameter-value": "${repo_url}" + "vnf-parameter-name": "repo_url_blob", + "vnf-parameter-value": "${repo_url_blob}" }, { - "vnf-parameter-name": "repo_user", - "vnf-parameter-value": "${repo_user}" + "vnf-parameter-name": "repo_url_artifacts", + "vnf-parameter-value": "${repo_url_artifacts}" }, { - "vnf-parameter-name": "repo_passwd", - "vnf-parameter-value": "${repo_passwd}" + "vnf-parameter-name": "demo_artifacts_version", + "vnf-parameter-value": "${demo_artifacts_version}" }, { "vnf-parameter-name": "ecomp_private_net_id", @@ -62,10 +62,6 @@ "vnf-parameter-name": "vdns_name_0", "vnf-parameter-value": "${scaling_vdns_name_0}" }, - { - "vnf-parameter-name": "webserver_ip", - "vnf-parameter-value": "${webserver_ip}" - }, { "vnf-parameter-name": "dcae_collector_ip", "vnf-parameter-value": "${dcae_collector_ip}" diff --git a/robot/assets/templates/sdnc/vfw_preload.template b/robot/assets/templates/sdnc/vfw_preload.template index c94c565f..fbe96ca9 100644 --- a/robot/assets/templates/sdnc/vfw_preload.template +++ b/robot/assets/templates/sdnc/vfw_preload.template @@ -15,16 +15,16 @@ }, "vnf-parameters": [ { - "vnf-parameter-name": "repo_url", - "vnf-parameter-value": "${repo_url}" + "vnf-parameter-name": "repo_url_blob", + "vnf-parameter-value": "${repo_url_blob}" }, { - "vnf-parameter-name": "repo_user", - "vnf-parameter-value": "${repo_user}" + "vnf-parameter-name": "repo_url_artifacts", + "vnf-parameter-value": "${repo_url_artifacts}" }, { - "vnf-parameter-name": "repo_passwd", - "vnf-parameter-value": "${repo_passwd}" + "vnf-parameter-name": "demo_artifacts_version", + "vnf-parameter-value": "${demo_artifacts_version}" }, { "vnf-parameter-name": "ecomp_private_net_id", @@ -94,10 +94,6 @@ "vnf-parameter-name": "vsn_name_0", "vnf-parameter-value": "${vsn_name_0}" }, - { - "vnf-parameter-name": "webserver_ip", - "vnf-parameter-value": "${webserver_ip}" - }, { "vnf-parameter-name": "dcae_collector_ip", "vnf-parameter-value": "${dcae_collector_ip}" diff --git a/robot/assets/templates/sdnc/vlb_preload.template b/robot/assets/templates/sdnc/vlb_preload.template index 736f790b..acc3c9d1 100644 --- a/robot/assets/templates/sdnc/vlb_preload.template +++ b/robot/assets/templates/sdnc/vlb_preload.template @@ -15,16 +15,16 @@ }, "vnf-parameters": [ { - "vnf-parameter-name": "repo_url", - "vnf-parameter-value": "${repo_url}" + "vnf-parameter-name": "repo_url_blob", + "vnf-parameter-value": "${repo_url_blob}" }, { - "vnf-parameter-name": "repo_user", - "vnf-parameter-value": "${repo_user}" + "vnf-parameter-name": "repo_url_artifacts", + "vnf-parameter-value": "${repo_url_artifacts}" }, { - "vnf-parameter-name": "repo_passwd", - "vnf-parameter-value": "${repo_passwd}" + "vnf-parameter-name": "demo_artifacts_version", + "vnf-parameter-value": "${demo_artifacts_version}" }, { "vnf-parameter-name": "ecomp_private_net_id", @@ -70,10 +70,6 @@ "vnf-parameter-name": "vdns_name_0", "vnf-parameter-value": "${vdns_name_0}" }, - { - "vnf-parameter-name": "webserver_ip", - "vnf-parameter-value": "${webserver_ip}" - }, { "vnf-parameter-name": "dcae_collector_ip", "vnf-parameter-value": "${dcae_collector_ip}" -- cgit 1.2.3-korg