Merge "Fix Heat Health Check"

[demo.git] / heat / ONAP / onap_openstack.yaml

diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 4445dd3..a63ff1a 100644 (file)
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -298,6 +298,10 @@ parameters:
     type: string
   nbi_repo:
     type: string
+  aaf_repo:
+    type: string
+  oof_repo:
+    type: string
 
   ################################
   #                              #
@@ -320,7 +324,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
@@ -376,7 +380,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
@@ -422,6 +426,8 @@ parameters:
     type: string
   nbi_docker:
     type: string
+  dbcl_docker:
+    type: string
 
   vfc_nokia_docker:
     type: string
@@ -493,6 +499,10 @@ parameters:
     type: string
   nbi_branch:
     type: string
+  aaf_branch:
+    type: string
+  oof_branch:
+    type: string
 
 #############
 #           #
@@ -944,6 +954,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
 
@@ -959,6 +970,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
@@ -1029,6 +1041,7 @@ resources:
             __music_ip_addr__: { get_param: music_ip_addr }
             __oof_ip_addr__: { get_param: oof_ip_addr }
             __aaf_ip_addr__: { get_param: aaf_ip_addr }
+            __nbi_ip_addr__: { get_param: nbi_ip_addr }
             __external_dns__: { get_param: external_dns }
             __ubuntu_1404_image__: { get_param: ubuntu_1404_image }
             __ubuntu_1604_image__: { get_param: ubuntu_1604_image }
@@ -1064,6 +1077,7 @@ 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
@@ -1071,9 +1085,11 @@ resources:
             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 "__oof_ip_addr__" > /opt/config/oof_ip_addr.txt
             echo "__aaf_ip_addr__" > /opt/config/aaf_ip_addr.txt
+            echo "__nbi_ip_addr__" > /opt/config/nbi_ip_addr.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
             echo "__external_dns__" > /opt/config/external_dns.txt
             echo "__vm_flavor__" > /opt/config/vm_flavor.txt
@@ -1860,7 +1876,7 @@ resources:
             __dcae_ph_docker__:  { get_param: dcae_ph_docker }
             __dcae_sch_docker__:  { get_param: dcae_sch_docker }
             __dcae_heartbeat_docker__:  { get_param: dcae_heartbeat_docker }
-            __dcae_prh_docker__:  { get_param: dcaeprh_docker }
+            __dcae_prh_docker__:  { get_param: dcae_prh_docker }
             __holmes_em_docker__:  { get_param: holmes_em_docker }
             __holmes_rm_docker__:  { get_param: holmes_rm_docker }
 
@@ -2065,6 +2081,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: |
@@ -2079,6 +2097,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
 
@@ -2107,7 +2127,7 @@ resources:
   aaf_vm:
     type: OS::Nova::Server
     properties:
-      image: { get_param: ubuntu_1404_image }
+      image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_medium }
       name:
         str_replace:
@@ -2132,6 +2152,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
 
@@ -2148,6 +2169,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
@@ -2198,6 +2220,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
 
@@ -2214,6 +2239,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