consolidate rackspace and openstack pktgen for vLB

[demo.git] / heat / vLB / packet_gen_vlb.yaml

diff --git a/heat/vLB/packet_gen_vlb_rackspace.yaml b/heat/vLB/packet_gen_vlb.yaml
similarity index 94%
rename from heat/vLB/packet_gen_vlb_rackspace.yaml
rename to heat/vLB/packet_gen_vlb.yaml
index fea9a77..7a63ef3 100644 (file)
--- a/heat/vLB/packet_gen_vlb_rackspace.yaml
+++ b/heat/vLB/packet_gen_vlb.yaml
@@ -77,6 +77,10 @@ parameters:
     type: string
     label: Artifacts version used in demo vnfs
     description: Artifacts (jar, tar.gz) version used in demo vnfs
+  cloud_env:
+    type: string
+    label: Cloud environment
+    description: Cloud environment (e.g., openstack, rackspace)
 
 #############
 #           #
@@ -122,6 +126,7 @@ resources:
             __vlb_ipaddr__: { get_param: vlb_ipaddr }
             __demo_artifacts_version__ : { get_param: demo_artifacts_version }
             __install_script_version__ : { get_param: install_script_version }
+            __cloud_env__: { get_param: cloud_env }
           template: |
             #!/bin/bash
 
@@ -132,6 +137,7 @@ resources:
             echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
             echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
             echo "__install_script_version__" > /opt/config/install_script_version.txt
+            echo "__cloud_env__" > /opt/config/cloud_env.txt
 
             # Download and run install script
             curl -k __repo_url_blob__/org.openecomp.demo/vnfs/vlb/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh