X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.yaml;h=d836b78eca882bf1449378f5d149f89bf82954c5;hb=8c1c99dfc4a42ff8e438a13858c95340a0f677c7;hp=76526fcb71306a9cfd8bb3c91c21319202276483;hpb=65b788fb0f379ac334e138ce37b72475884fe72d;p=demo.git

diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 76526fcb..d836b78e 100644
--- 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
@@ -2438,6 +2434,9 @@ resources:
         - path: /opt/aaf_vm_init.sh
           permissions: '0755'
           content: { get_file: cloud-config/aaf_vm_init.sh }
+        - path: /opt/config/sample_ca/aaf.signer.p12
+          permissions: '0600'
+          content: { get_file: cloud-config/sample_ca/aaf.signer.p12 }
         - path: /etc/init.d/serv.sh
           permissions: '0755'
           content:
@@ -2459,14 +2458,17 @@ resources:
               __docker_version__: { get_param: aaf_docker }
               __aaf_repo__: { get_param: aaf_repo }
               __gerrit_branch__: { get_param: aaf_branch }
+              __public_ip__: { get_attr: [aaf_floating_ip, floating_ip_address] }
               __local_ip__: { get_param: aaf_ip_addr }
             template: |
               #!/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
+              echo "__public_ip__" > /opt/config/public_ip.txt
               echo "__local_ip__" > /opt/config/local_ip.txt
 
               cd /opt