summaryrefslogtreecommitdiffstats
path: root/heat/ONAP/onap_openstack.yaml
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2018-04-17 17:09:44 +0200
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2018-04-17 17:09:44 +0200
commit0d4045572e474080b22f81546306bae1a98afbc2 (patch)
tree2afd6c7f12fa7c83cab27aeba3e6d604251676e2 /heat/ONAP/onap_openstack.yaml
parentd60cdf2bd31e6a8143aa5bc36ec7b12414c68523 (diff)
Fix deployment errors in nbi cloud init
add some missing needed variables in heat stack part of nbi (ip addresses of sdc, aai and so). Retrieve them and use them in nbi_vm_init.sh script. Clean nbi_install.sh script in order to be faster. Change-Id: I234e0ebdaa75c87c1585bf128831af54515e1eab Issue-ID: EXTAPI-76 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Diffstat (limited to 'heat/ONAP/onap_openstack.yaml')
-rw-r--r--heat/ONAP/onap_openstack.yaml10
1 files changed, 8 insertions, 2 deletions
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index c5ffdaff..19515ed3 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -322,7 +322,7 @@ parameters:
dcae_snmptrap_docker:
type: string
default: latest
- description: Docker image version for onap/org.dcaegen2.collectors.snmptrap
+ description: Docker image version for onap/org.dcaegen2.collectors.snmptrap
dcae_ves_docker:
type: string
default: latest
@@ -378,7 +378,7 @@ parameters:
dcae_prh_docker:
type: string
default: latest
- description: Docker image version for onap/org.dcaegen2.services.prh.prh-app-server
+ description: Docker image version for onap/org.dcaegen2.services.prh.prh-app-server
holmes_em_docker:
type: string
default: latest
@@ -2202,6 +2202,9 @@ resources:
__gerrit_branch__: { get_param: nbi_branch }
__cloud_env__: { get_param: cloud_env }
__external_dns__: { get_param: external_dns }
+ __sdc_ip_addr__: { get_param: sdc_ip_addr }
+ __aai1_ip_addr__: { get_param: aai1_ip_addr }
+ __so_ip_addr__: { get_param: so_ip_addr }
template: |
#!/bin/bash
@@ -2218,6 +2221,9 @@ resources:
echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt
echo "__external_dns__" > /opt/config/external_dns.txt
+ echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
+ echo "__aai1_ip_addr__" > /opt/config/aai_ip_addr.txt
+ echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt
# Download and run install script
curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/nbi_install.sh -o /opt/nbi_install.sh