diff options
| author |   Alexis de Talhouët <adetalhouet89@gmail.com> | 2018-11-21 10:28:44 -0500 |
|---|---|---|
| committer | Alexis de Talhouët <adetalhouet89@gmail.com> | 2018-11-21 10:30:32 -0500 |
| commit | d5fa03b5fe63e4a6cca96c3a592118cd1486c69e (patch) | |
| tree | 8f9744db847aa57b55b72fbde34d4104f9af9aa0 /heat/vFW | |
| parent | 5c1e93c084aa0d2e7efbe8f18c87ee36fc2608cc (diff) | |
Do not use CDS for base vFW
Change-Id: I706ebbbffe461398cf8419a49418cf4795f1eb0f
Issue-ID: INT-745
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
Diffstat (limited to 'heat/vFW')
| -rw-r--r-- | heat/vFW/base_vfw.env | 3 | ||||
| -rw-r--r-- | heat/vFW/base_vfw.yaml | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/heat/vFW/base_vfw.env b/heat/vFW/base_vfw.env index 269bb097..83ae97b4 100644 --- a/heat/vFW/base_vfw.env +++ b/heat/vFW/base_vfw.env @@ -29,6 +29,3 @@ parameters: pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN cloud_env: openstack sec_group: PUT THE ONAP SECURITY GROUP HERE - sdnc_model_name: vFW_spinup - sdnc_model_version: 1.0.0 - sdnc_artifact_name: vFW_vNF_Artifact diff --git a/heat/vFW/base_vfw.yaml b/heat/vFW/base_vfw.yaml index 8df04956..00e03ce4 100644 --- a/heat/vFW/base_vfw.yaml +++ b/heat/vFW/base_vfw.yaml @@ -250,7 +250,7 @@ resources: - port: { get_resource: vfw_private_0_port } - port: { get_resource: vfw_private_1_port } - port: { get_resource: vfw_private_2_port } - metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }, sdnc_model_name: { get_param: sdnc_model_name }, sdnc_model_version: { get_param: sdnc_model_version }, sdnc_artifact_name: { get_param: sdnc_artifact_name }} + metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }} user_data_format: RAW user_data: str_replace: @@ -324,7 +324,7 @@ resources: - network: { get_param: public_net_id } - port: { get_resource: vpg_private_0_port } - port: { get_resource: vpg_private_1_port } - metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }, sdnc_model_name: { get_param: sdnc_model_name }, sdnc_model_version: { get_param: sdnc_model_version }, sdnc_artifact_name: { get_param: sdnc_artifact_name }} + metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }} user_data_format: RAW user_data: str_replace: @@ -396,7 +396,7 @@ resources: - network: { get_param: public_net_id } - port: { get_resource: vsn_private_0_port } - port: { get_resource: vsn_private_1_port } - metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }, sdnc_model_name: { get_param: sdnc_model_name }, sdnc_model_version: { get_param: sdnc_model_version }, sdnc_artifact_name: { get_param: sdnc_artifact_name }} + metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }} user_data_format: RAW user_data: str_replace: |