Merge "update opt config variables for SO"

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

diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 379c468..fba9bfb 100644 (file)
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -3,7 +3,7 @@
 #==================LICENSE_START==========================================
 #
 #
-# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -121,13 +121,9 @@ parameters:
     type: string
     description: OpenStack username
 
-  openstack_auth_method:
-    type: string
-    description: OpenStack authentication method (password VS. api-key)
-
   openstack_api_key:
     type: string
-    description: OpenStack password or API Key
+    description: Encrypted OpenStack password
 
   keystone_url:
     type: string
@@ -1266,6 +1262,15 @@ resources:
               echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
               echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt
               echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt
+              # in HEAT install the components are on the same IP address but not for OOM
+              echo "__so_ip_addr__" > /opt/config/so_apihand_ip_addr.txt
+              echo "__so_ip_addr__" > /opt/config/so_asdchand_ip_addr.txt
+              echo "__so_ip_addr__" > /opt/config/so_bpmn_ip_addr.txt
+              echo "__so_ip_addr__" > /opt/config/so_catdb_ip_addr.txt
+              echo "__so_ip_addr__" > /opt/config/so_openstack_ip_addr.txt
+              echo "__so_ip_addr__" > /opt/config/so_reqdb_ip_addr.txt
+              echo "__so_ip_addr__" > /opt/config/so_sdnc_ip_addr.txt
+              echo "__so_ip_addr__" > /opt/config/so_vfc_ip_addr.txt
               echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
               echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
               echo "__policy_ip_addr__" > /opt/config/policy_healthcheck_ip_addr.txt