Code Review
/
demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update branch and artifact version for R1
[demo.git]
/
heat
/
ONAP
/
onap_openstack.env
diff --git
a/heat/ONAP/onap_openstack.env
b/heat/ONAP/onap_openstack.env
index
b0998a6
..
97f575a
100644
(file)
--- a/
heat/ONAP/onap_openstack.env
+++ b/
heat/ONAP/onap_openstack.env
@@
-24,7
+24,7
@@
parameters:
flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE
flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE
- vm_base_name:
vm1
+ vm_base_name:
onap
key_name: onap_key
key_name: onap_key
@@
-40,7
+40,7
@@
parameters:
dmaap_topic: AUTO
dmaap_topic: AUTO
- artifacts_version: 1.1.
0-SNAPSHOT
+ artifacts_version: 1.1.
1
openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
@@
-111,54
+111,55
@@
parameters:
################################
# #
# Docker versions and branches #
################################
# #
# Docker versions and branches #
+ # Generated using onap_openstack_template.env and manifest-to-env.sh
# #
################################
# #
################################
- aai_branch:
master
- appc_branch:
master
- so_branch:
master
+ aai_branch:
amsterdam
+ appc_branch:
amsterdam
+ so_branch:
amsterdam
mr_branch: master
mr_branch: master
- policy_branch:
master
- portal_branch:
release-1.3.0
+ policy_branch:
amsterdam
+ portal_branch:
amsterdam
robot_branch: master
sdc_branch: release-1.1.0
robot_branch: master
sdc_branch: release-1.1.0
- sdnc_branch:
release-1.1.0
- vid_branch:
master
- clamp_branch:
master
- vnfsdk_branch:
master
+ sdnc_branch:
amsterdam
+ vid_branch:
amsterdam
+ clamp_branch:
amsterdam
+ vnfsdk_branch:
amsterdam
aai_docker: v1.1.0
aai_docker: v1.1.0
- aai_sparky_docker: v1.
0
.0
- appc_docker:
1.1-STAGING-latest
- so_docker: v1.1.
0
+ aai_sparky_docker: v1.
1
.0
+ appc_docker:
v1.2.0
+ so_docker: v1.1.
1
dcae_docker: v1.1.0
dcae_docker: v1.1.0
- policy_docker: v1.1.
0
+ policy_docker: v1.1.
1
portal_docker: v1.3.0
robot_docker: 1.1-STAGING-latest
portal_docker: v1.3.0
robot_docker: 1.1-STAGING-latest
- sdc_docker:
1.1-STAGING-latest
- sdnc_docker:
1.2-STAGING-latest
- vid_docker: v1.1.
0
+ sdc_docker:
v1.1.0
+ sdnc_docker:
v1.2.1
+ vid_docker: v1.1.
1
clamp_docker: v1.1.0
msb_docker: 1.0.0
clamp_docker: v1.1.0
msb_docker: 1.0.0
- mvim_docker:
latest
- uui_docker:
latest
+ mvim_docker:
v1.0.0
+ uui_docker:
v1.0.1
esr_docker: v1.0.0
esr_docker: v1.0.0
- dgbuilder_docker:
0.1-STAGING-latest
+ dgbuilder_docker:
v0.1.0
cli_docker: v1.1.0
cli_docker: v1.1.0
- vfc_nokia_docker: v1.0.
0
- vfc_ztevmanagerdriver_docker: v1.0.
1
- vfc_ztesdncdriver_docker: v1.0.
1
+ vfc_nokia_docker: v1.0.
2
+ vfc_ztevmanagerdriver_docker: v1.0.
2
+ vfc_ztesdncdriver_docker: v1.0.
0
vfc_vnfres_docker: v1.0.1
vfc_vnfmgr_docker: v1.0.1
vfc_vnflcm_docker: v1.0.1
vfc_resmanagement_docker: v1.0.0
vfc_vnfres_docker: v1.0.1
vfc_vnfmgr_docker: v1.0.1
vfc_vnflcm_docker: v1.0.1
vfc_resmanagement_docker: v1.0.0
- vfc_nslcm_docker: v1.0.
1
- vfc_huawei_docker: v1.0.
0
+ vfc_nslcm_docker: v1.0.
2
+ vfc_huawei_docker: v1.0.
2
vfc_jujudriver_docker: v1.0.0
vfc_gvnfmdriver_docker: v1.0.1
vfc_emsdriver_docker: v1.0.1
vfc_jujudriver_docker: v1.0.0
vfc_gvnfmdriver_docker: v1.0.1
vfc_emsdriver_docker: v1.0.1
- vfc_catalog_docker: v1.0.
1
+ vfc_catalog_docker: v1.0.
2
vfc_wfengine_mgrservice_docker: v1.0.0
vfc_wfengine_activiti_docker: v1.0.0
vfc_wfengine_mgrservice_docker: v1.0.0
vfc_wfengine_activiti_docker: v1.0.0