Code Review / demo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 41a4fc5)
Update branch and artifact version for R1 27/25227/1
authorMarco Platania <platania@research.att.com>
Thu, 30 Nov 2017 16:39:01 +0000 (11:39 -0500)
committerMarco Platania <platania@research.att.com>
Thu, 30 Nov 2017 16:39:01 +0000 (11:39 -0500)
Modify HEAT templates for ONAP platform and vFW, vLB/vDNS use cases

Change-Id: I839542779807fad91b41d043ffb0225545cbf69c
Issue-ID: INT-288
Signed-off-by: Marco Platania <platania@research.att.com>
heat/ONAP/onap_openstack.env patch | blob | history
heat/ONAP/onap_openstack_template.env patch | blob | history
heat/vFW/base_vfw.env patch | blob | history
heat/vFWCL/vFWSNK/base_vfw.env patch | blob | history
heat/vFWCL/vPKG/base_vpkg.env patch | blob | history
heat/vLB/base_vlb.env patch | blob | history

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 56a8e62..97f575a 100644 (file)
--- 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 40cdb01..288955c 100644 (file)
--- 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 9790d0e..346cb7d 100644 (file)
--- a/heat/vFW/base_vfw.env
+++ b/heat/vFW/base_vfw.env
@@ -1,32 +1,32 @@
-parameters:\r
-  vfw_image_name: PUT THE VM IMAGE NAME HERE\r
-  vfw_flavor_name: PUT THE VM FLAVOR NAME HERE\r
-  public_net_id: PUT THE PUBLIC NETWORK ID HERE\r
-  unprotected_private_net_id: zdfw1fwl01_unprotected\r
-  protected_private_net_id: zdfw1fwl01_protected\r
-  onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE\r
-  onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE\r
-  unprotected_private_net_cidr: 192.168.10.0/24\r
-  protected_private_net_cidr: 192.168.20.0/24\r
-  onap_private_net_cidr: 10.0.0.0/16\r
-  vfw_private_ip_0: 192.168.10.100\r
-  vfw_private_ip_1: 192.168.20.100\r
-  vfw_private_ip_2: 10.0.100.1\r
-  vpg_private_ip_0: 192.168.10.200\r
-  vpg_private_ip_1: 10.0.100.2\r
-  vsn_private_ip_0: 192.168.20.250\r
-  vsn_private_ip_1: 10.0.100.3\r
-  vfw_name_0: zdfw1fwl01fwl01\r
-  vpg_name_0: zdfw1fwl01pgn01\r
-  vsn_name_0: zdfw1fwl01snk01\r
-  vnf_id: vFirewall_demo_app\r
-  vf_module_id: vFirewall\r
-  dcae_collector_ip: 10.0.4.102\r
-  dcae_collector_port: 8080\r
-  repo_url_blob: https://nexus.onap.org/content/sites/raw\r
-  repo_url_artifacts: https://nexus.onap.org/content/groups/staging\r
-  demo_artifacts_version: 1.1.0
-  install_script_version: 1.1.0-SNAPSHOT\r
-  key_name: vfw_key\r
-  pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN\r
-  cloud_env: PUT openstack OR rackspace HERE\r
+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 84ed850..e729141 100644 (file)
--- 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 a7a30e3..e4da471 100644 (file)
--- 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 50da384..3c14f63 100644 (file)
--- 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
Demo applications and templates for ONAP platform instantiation.