From: Gary Wu <gary.i.wu@huawei.com>
Date: Tue, 11 Sep 2018 15:07:08 +0000 (+0000)
Subject: Merge "update opt config variables for SO"
X-Git-Tag: 1.3.0~45
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5c52cfa2e1b6b5f29555d971bd3967804a127248;hp=-c;p=demo.git

Merge "update opt config variables for SO"
---

5c52cfa2e1b6b5f29555d971bd3967804a127248
diff --combined heat/ONAP/onap_openstack.yaml
index 8971c784,d258d71d..fba9bfb4
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@@ -3,7 -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,9 -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
@@@ -1262,6 -1266,15 +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
@@@ -2434,9 -2447,6 +2443,9 @@@
          - path: /opt/aaf_vm_init.sh
            permissions: '0755'
            content: { get_file: cloud-config/aaf_vm_init.sh }
 +        - path: /opt/config/sample_ca/aaf.signer.b64
 +          permissions: '0600'
 +          content: { get_file: cloud-config/sample_ca/aaf.signer.b64 }
          - path: /etc/init.d/serv.sh
            permissions: '0755'
            content:
@@@ -2464,7 -2474,6 +2473,7 @@@
                #!/bin/bash
  
                # Create configuration files
 +              mkdir -p /opt/config/sample_ca
                echo "__docker_version__" > /opt/config/docker_version.txt
                echo "__aaf_repo__" > /opt/config/remote_repo.txt
                echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt