X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack_light.yaml;h=2b8893249aab71a5e4439a44510416d087063c70;hb=4b50d17477d04e978c412fc80c561d5085a117cb;hp=79fffad9863ba2a2fe4a69b72d50fdb5351ca6b6;hpb=cf7a2042c88b7079ef829a62ef2d468afef7bd1b;p=demo.git diff --git a/heat/ONAP/onap_openstack_light.yaml b/heat/ONAP/onap_openstack_light.yaml index 79fffad9..2b889324 100644 --- a/heat/ONAP/onap_openstack_light.yaml +++ b/heat/ONAP/onap_openstack_light.yaml @@ -296,6 +296,8 @@ parameters: type: string aaf_repo: type: string + oof_repo: + type: string ################################ # # @@ -333,6 +335,8 @@ parameters: type: string mvim_docker: type: string + mvim_openstack_docker: + type: string uui_docker: type: string esr_docker: @@ -349,6 +353,8 @@ parameters: type: string nbi_docker: type: string + dbcl_docker: + type: string vfc_nokia_docker: type: string @@ -420,6 +426,8 @@ parameters: type: string aaf_branch: type: string + oof_branch: + type: string ############# # # @@ -869,6 +877,7 @@ resources: __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } __mr_repo__: { get_param: mr_repo } + __dbcl_docker__: { get_param: dbcl_docker } template: | #!/bin/bash @@ -884,6 +893,7 @@ resources: echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__mr_repo__" > /opt/config/remote_repo.txt + echo "__dbcl_docker__" > /opt/config/docker_version.txt # Download and run install script curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/mr_install.sh -o /opt/mr_install.sh @@ -947,6 +957,9 @@ resources: __policy_ip_addr__: { get_param: policy_ip_addr } __portal_ip_addr__: { get_param: portal_ip_addr } __sdc_ip_addr__: { get_param: sdc_ip_addr } + __sdc_fe_ip_addr__: { get_param: sdc_ip_addr } + __sdc_be_ip_addr__: { get_param: sdc_ip_addr } + __sdc_be_onboard_ip_addr__: { get_param: sdc_ip_addr } __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __vid_ip_addr__: { get_param: vid_ip_addr } __clamp_ip_addr__: { get_param: clamp_ip_addr } @@ -954,6 +967,7 @@ resources: __clamp_ip_addr__: { get_param: clamp_ip_addr } __openo_ip_addr__: { get_param: openo_ip_addr } __music_ip_addr__: { get_param: music_ip_addr } + __nbi_ip_addr__: { get_param: nbi_ip_addr } __external_dns__: { get_param: external_dns } __vm_image_name__: { get_param: ubuntu_1404_image } __vm_flavor__: { get_param: flavor_medium } @@ -988,24 +1002,32 @@ resources: echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt + echo "__portal_ip_addr__" > /opt/config/cli_ip_addr.txt echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt - echo "__sdc_ip_addr__" > /opt/config/sdc_be_ip_addr.txt - echo "__sdc_ip_addr__" > /opt/config/sdc_fe_ip_addr.txt + echo "__sdc_fe_ip_addr__" > /opt/config/sdc_fe_ip_addr.txt + echo "__sdc_be_ip_addr__" > /opt/config/sdc_be_ip_addr.txt + echo "__sdc_be_onboard_ip_addr__" > /opt/config/sdc_be_onboard_ip_addr.txt echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt + echo "__openo_ip_addr__" > /opt/config/vnfsdk_ip_addr.txt echo "__music_ip_addr__" > /opt/config/music_ip_addr.txt + echo "__nbi_ip_addr__" > /opt/config/nbi_ip_addr.txt echo "__oof_ip_addr__" > /opt/config/oof_ip_addr.txt echo "__aaf_ip_addr__" > /opt/config/aaf_ip_addr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__vm_image_name__" > /opt/config/vm_image_name.txt + echo "__vm_flavor__" > /opt/config/vm_flavor.txt echo "__ubuntu_1404_image__" > /opt/config/ubuntu_1404_image.txt echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt echo "__script_version__" > /opt/config/script_version.txt echo "__public_net_id__" > /opt/config/public_net_id.txt echo "__robot_repo__" > /opt/config/remote_repo.txt + echo "localhost" > /opt/config/log_elasticsearch_ip_addr.txt # these tests will be skipped by robot + echo "localhost" > /opt/config/log_logstash_ip_addr.txt # these tests will be skipped by robot + echo "localhost" > /opt/config/log_kibana_ip_addr.txt # these tests will be skipped by robot # Download and run install script curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/robot_install.sh -o /opt/robot_install.sh @@ -1582,6 +1604,7 @@ resources: __vnfsdk_branch__: { get_param: vnfsdk_branch } __msb_docker__: { get_param: msb_docker } __mvim_docker__: { get_param: mvim_docker } + __mvim_openstack_docker__: { get_param: mvim_openstack_docker } __uui_docker__: { get_param: uui_docker } __esr_docker__: { get_param: esr_docker } __vnfsdk_repo__: { get_param: vnfsdk_repo } @@ -1622,6 +1645,7 @@ resources: echo "__vnfsdk_branch__" > /opt/config/vnfsdk_branch.txt echo "__msb_docker__" > /opt/config/msb_docker.txt echo "__mvim_docker__" > /opt/config/mvim_docker.txt + echo "__mvim_openstack_docker__" > /opt/config/mvim_openstack_docker.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 @@ -1692,7 +1716,7 @@ resources: flavor: { get_param: flavor_small } name: str_replace: - template: base-dcae-bootstrap + template: base-dcae params: base: { get_param: vm_base_name } key_name: { get_resource: vm_key } @@ -1947,6 +1971,8 @@ resources: __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } __docker_version__: { get_param: oof_docker } + __oof_repo__: { get_param: oof_repo } + __gerrit_branch__: { get_param: oof_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } template: | @@ -1961,6 +1987,8 @@ resources: echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt + echo "__oof_repo__" > /opt/config/remote_repo.txt + echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt @@ -2014,6 +2042,7 @@ resources: __external_dns__: { get_param: external_dns } __aaf_repo__: { get_param: aaf_repo } __gerrit_branch__: { get_param: aaf_branch } + __local_ip__: { get_param: aaf_ip_addr } template: | #!/bin/bash @@ -2030,6 +2059,7 @@ resources: echo "__external_dns__" > /opt/config/external_dns.txt echo "__aaf_repo__" > /opt/config/remote_repo.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__local_ip__" > /opt/config/local_ip.txt # Download and run install script curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aaf_install.sh -o /opt/aaf_install.sh