aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--heat/ONAP/onap_openstack.env20
-rw-r--r--heat/ONAP/onap_openstack_template.env20
-rw-r--r--heat/vFW/base_vfw.env64
-rw-r--r--heat/vFWCL/vFWSNK/base_vfw.env4
-rw-r--r--heat/vFWCL/vPKG/base_vpkg.env4
-rw-r--r--heat/vLB/base_vlb.env4
6 files changed, 58 insertions, 58 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 56a8e623..97f575a2 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -40,7 +40,7 @@ parameters:
dmaap_topic: AUTO
- artifacts_version: 1.1.0-SNAPSHOT
+ artifacts_version: 1.1.1
openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
@@ -115,18 +115,18 @@ parameters:
# #
################################
- aai_branch: master
- appc_branch: master
- so_branch: master
+ aai_branch: amsterdam
+ appc_branch: amsterdam
+ so_branch: amsterdam
mr_branch: master
policy_branch: amsterdam
- portal_branch: release-1.3.0
+ portal_branch: amsterdam
robot_branch: master
- sdc_branch: master
- sdnc_branch: master
- vid_branch: master
- clamp_branch: master
- vnfsdk_branch: master
+ sdc_branch: release-1.1.0
+ sdnc_branch: amsterdam
+ vid_branch: amsterdam
+ clamp_branch: amsterdam
+ vnfsdk_branch: amsterdam
aai_docker: v1.1.0
aai_sparky_docker: v1.1.0
diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index 40cdb01e..288955cf 100644
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -40,7 +40,7 @@ parameters:
dmaap_topic: AUTO
- artifacts_version: 1.1.0-SNAPSHOT
+ artifacts_version: 1.1.1
openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
@@ -115,18 +115,18 @@ parameters:
# #
################################
- aai_branch: master
- appc_branch: master
- so_branch: master
+ aai_branch: amsterdam
+ appc_branch: amsterdam
+ so_branch: amsterdam
mr_branch: master
policy_branch: amsterdam
- portal_branch: release-1.3.0
+ portal_branch: amsterdam
robot_branch: master
- sdc_branch: master
- sdnc_branch: master
- vid_branch: master
- clamp_branch: master
- vnfsdk_branch: master
+ sdc_branch: release-1.1.0
+ sdnc_branch: amsterdam
+ vid_branch: amsterdam
+ clamp_branch: amsterdam
+ vnfsdk_branch: amsterdam
aai_docker: ${AAI_RESOURCES_DOCKER}
aai_sparky_docker: ${AAI_RESOURCES_DOCKER}
diff --git a/heat/vFW/base_vfw.env b/heat/vFW/base_vfw.env
index 9790d0e8..346cb7df 100644
--- a/heat/vFW/base_vfw.env
+++ b/heat/vFW/base_vfw.env
@@ -1,32 +1,32 @@
-parameters:
- vfw_image_name: PUT THE VM IMAGE NAME HERE
- vfw_flavor_name: PUT THE VM FLAVOR NAME HERE
- public_net_id: PUT THE PUBLIC NETWORK ID HERE
- unprotected_private_net_id: zdfw1fwl01_unprotected
- protected_private_net_id: zdfw1fwl01_protected
- onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
- onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
- unprotected_private_net_cidr: 192.168.10.0/24
- protected_private_net_cidr: 192.168.20.0/24
- onap_private_net_cidr: 10.0.0.0/16
- vfw_private_ip_0: 192.168.10.100
- vfw_private_ip_1: 192.168.20.100
- vfw_private_ip_2: 10.0.100.1
- vpg_private_ip_0: 192.168.10.200
- vpg_private_ip_1: 10.0.100.2
- vsn_private_ip_0: 192.168.20.250
- vsn_private_ip_1: 10.0.100.3
- vfw_name_0: zdfw1fwl01fwl01
- vpg_name_0: zdfw1fwl01pgn01
- vsn_name_0: zdfw1fwl01snk01
- vnf_id: vFirewall_demo_app
- vf_module_id: vFirewall
- dcae_collector_ip: 10.0.4.102
- dcae_collector_port: 8080
- repo_url_blob: https://nexus.onap.org/content/sites/raw
- repo_url_artifacts: https://nexus.onap.org/content/groups/staging
- demo_artifacts_version: 1.1.0
- install_script_version: 1.1.0-SNAPSHOT
- key_name: vfw_key
- pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
- cloud_env: PUT openstack OR rackspace HERE
+parameters:
+ vfw_image_name: PUT THE VM IMAGE NAME HERE
+ vfw_flavor_name: PUT THE VM FLAVOR NAME HERE
+ public_net_id: PUT THE PUBLIC NETWORK ID HERE
+ unprotected_private_net_id: zdfw1fwl01_unprotected
+ protected_private_net_id: zdfw1fwl01_protected
+ onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
+ onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
+ unprotected_private_net_cidr: 192.168.10.0/24
+ protected_private_net_cidr: 192.168.20.0/24
+ onap_private_net_cidr: 10.0.0.0/16
+ vfw_private_ip_0: 192.168.10.100
+ vfw_private_ip_1: 192.168.20.100
+ vfw_private_ip_2: 10.0.100.1
+ vpg_private_ip_0: 192.168.10.200
+ vpg_private_ip_1: 10.0.100.2
+ vsn_private_ip_0: 192.168.20.250
+ vsn_private_ip_1: 10.0.100.3
+ vfw_name_0: zdfw1fwl01fwl01
+ vpg_name_0: zdfw1fwl01pgn01
+ vsn_name_0: zdfw1fwl01snk01
+ vnf_id: vFirewall_demo_app
+ vf_module_id: vFirewall
+ dcae_collector_ip: 10.0.4.102
+ dcae_collector_port: 8080
+ repo_url_blob: https://nexus.onap.org/content/sites/raw
+ repo_url_artifacts: https://nexus.onap.org/content/groups/staging
+ demo_artifacts_version: 1.1.1
+ install_script_version: 1.1.1
+ key_name: vfw_key
+ pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
+ cloud_env: PUT openstack OR rackspace HERE
diff --git a/heat/vFWCL/vFWSNK/base_vfw.env b/heat/vFWCL/vFWSNK/base_vfw.env
index 84ed850f..e729141d 100644
--- a/heat/vFWCL/vFWSNK/base_vfw.env
+++ b/heat/vFWCL/vFWSNK/base_vfw.env
@@ -25,8 +25,8 @@ parameters:
dcae_collector_port: 8080
repo_url_blob: https://nexus.onap.org/content/sites/raw
repo_url_artifacts: https://nexus.onap.org/content/groups/staging
- demo_artifacts_version: 1.1.0
- install_script_version: 1.1.0-SNAPSHOT
+ demo_artifacts_version: 1.1.1
+ install_script_version: 1.1.1
key_name: vfw_key
pub_key: PUT YOUR KEY HERE
cloud_env: PUT openstack OR rackspace HERE
diff --git a/heat/vFWCL/vPKG/base_vpkg.env b/heat/vFWCL/vPKG/base_vpkg.env
index a7a30e32..e4da4710 100644
--- a/heat/vFWCL/vPKG/base_vpkg.env
+++ b/heat/vFWCL/vPKG/base_vpkg.env
@@ -18,8 +18,8 @@ parameters:
vf_module_id: vTrafficPNG
repo_url_blob: https://nexus.onap.org/content/sites/raw
repo_url_artifacts: https://nexus.onap.org/content/groups/staging
- demo_artifacts_version: 1.1.0
- install_script_version: 1.1.0-SNAPSHOT
+ demo_artifacts_version: 1.1.1
+ install_script_version: 1.1.1
key_name: vfw_key
pub_key: PUT YOUR PUBLIC KEY HERE
cloud_env: PUT openstack OR rackspace HERE
diff --git a/heat/vLB/base_vlb.env b/heat/vLB/base_vlb.env
index 50da384f..3c14f63b 100644
--- a/heat/vLB/base_vlb.env
+++ b/heat/vLB/base_vlb.env
@@ -28,8 +28,8 @@ parameters:
dcae_collector_port: 8080
repo_url_blob: https://nexus.onap.org/content/sites/raw
repo_url_artifacts: https://nexus.onap.org/content/groups/staging
- demo_artifacts_version: 1.1.0
- install_script_version: 1.1.0-SNAPSHOT
+ demo_artifacts_version: 1.1.1
+ install_script_version: 1.1.1
key_name: vlb_key
pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
cloud_env: PUT openstack OR backspace HERE