summaryrefslogtreecommitdiffstats
path: root/heat/ONAP
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2017-11-30 11:39:01 -0500
committerMarco Platania <platania@research.att.com>2017-11-30 11:39:01 -0500
commit95fe0fe51167eadc963cd85293bf56e1b838f909 (patch)
tree72c95f51c1a7a312a7216b909ed3da1c01252ca0 /heat/ONAP
parent41a4fc5510f49f4ca1a9a2936c171adb7a6eab41 (diff)
Update branch and artifact version for R1
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>
Diffstat (limited to 'heat/ONAP')
-rw-r--r--heat/ONAP/onap_openstack.env20
-rw-r--r--heat/ONAP/onap_openstack_template.env20
2 files changed, 20 insertions, 20 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}