Code Review
/
demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add Nokia v2 docker image
[demo.git]
/
heat
/
ONAP
/
onap_openstack_light.yaml
diff --git
a/heat/ONAP/onap_openstack_light.yaml
b/heat/ONAP/onap_openstack_light.yaml
index
0b83ac8
..
a258d90
100644
(file)
--- a/
heat/ONAP/onap_openstack_light.yaml
+++ b/
heat/ONAP/onap_openstack_light.yaml
@@
-340,6
+340,8
@@
parameters:
vfc_nokia_docker:
type: string
vfc_nokia_docker:
type: string
+ vfc_nokiav2_docker:
+ type: string
vfc_ztevnfmdriver_docker:
type: string
vfc_ztesdncdriver_docker:
vfc_ztevnfmdriver_docker:
type: string
vfc_ztesdncdriver_docker:
@@
-369,6
+371,13
@@
parameters:
vfc_wfengine_activiti_docker:
type: string
vfc_wfengine_activiti_docker:
type: string
+ cbam_username:
+ type: string
+ cbam_password:
+ type: string
+ cbam_ip:
+ type: string
+
aai_branch:
type: string
appc_branch:
aai_branch:
type: string
appc_branch:
@@
-1556,6
+1565,10
@@
resources:
__esr_docker__: { get_param: esr_docker }
__vnfsdk_repo__: { get_param: vnfsdk_repo }
__vfc_nokia_docker__: { get_param: vfc_nokia_docker }
__esr_docker__: { get_param: esr_docker }
__vnfsdk_repo__: { get_param: vnfsdk_repo }
__vfc_nokia_docker__: { get_param: vfc_nokia_docker }
+ __vfc_nokiav2_docker__: { get_param: vfc_nokiav2_docker }
+ __cbam_ip__: { get_param: cbam_ip }
+ __cbam_username__: { get_param: cbam_username }
+ __cbam_password__: { get_param: cbam_password }
__vfc_ztevnfmdriver_docker__: { get_param: vfc_ztevnfmdriver_docker }
__vfc_ztesdncdriver_docker__: { get_param: vfc_ztesdncdriver_docker }
__vfc_vnfres_docker__: { get_param: vfc_vnfres_docker }
__vfc_ztevnfmdriver_docker__: { get_param: vfc_ztevnfmdriver_docker }
__vfc_ztesdncdriver_docker__: { get_param: vfc_ztesdncdriver_docker }
__vfc_vnfres_docker__: { get_param: vfc_vnfres_docker }
@@
-1590,8
+1603,12
@@
resources:
echo "__uui_docker__" > /opt/config/uui_docker.txt
echo "__esr_docker__" > /opt/config/esr_docker.txt
echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt
echo "__uui_docker__" > /opt/config/uui_docker.txt
echo "__esr_docker__" > /opt/config/esr_docker.txt
echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt
+ echo "__cbam_ip__" > /opt/config/cbam_ip.txt
+ echo "__cbam_username__" > /opt/config/cbam_username.txt
+ echo "__cbam_password__" > /opt/config/cbam_password.txt
echo "export NOKIA_DOCKER_VER=__vfc_nokia_docker__" >> /opt/config/vfc_docker.txt
echo "export NOKIA_DOCKER_VER=__vfc_nokia_docker__" >> /opt/config/vfc_docker.txt
+ echo "export NOKIAV2_DOCKER_VER=__vfc_nokiav2_docker__" >> /opt/config/vfc_docker.txt
echo "export ZTEVNFMDRIVER_DOCKER_VER=__vfc_ztevnfmdriver_docker__" >> /opt/config/vfc_docker.txt
echo "export ZTESDNCDRIVER_DOCKER_VER=__vfc_ztesdncdriver_docker__" >> /opt/config/vfc_docker.txt
echo "export VNFRES_DOCKER_VER=__vfc_vnfres_docker__" >> /opt/config/vfc_docker.txt
echo "export ZTEVNFMDRIVER_DOCKER_VER=__vfc_ztevnfmdriver_docker__" >> /opt/config/vfc_docker.txt
echo "export ZTESDNCDRIVER_DOCKER_VER=__vfc_ztesdncdriver_docker__" >> /opt/config/vfc_docker.txt
echo "export VNFRES_DOCKER_VER=__vfc_vnfres_docker__" >> /opt/config/vfc_docker.txt
@@
-1987,4
+2004,4
@@
resources:
curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aaf_install.sh -o /opt/aaf_install.sh
cd /opt
chmod +x aaf_install.sh
curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aaf_install.sh -o /opt/aaf_install.sh
cd /opt
chmod +x aaf_install.sh
- ./aaf_install.sh
\ No newline at end of file
+ ./aaf_install.sh