From: Marco Platania <platania@research.att.com>
Date: Wed, 5 Sep 2018 19:12:57 +0000 (+0000)
Subject: Merge "adjust AAF for b64"
X-Git-Tag: 1.3.0~51
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=941858a8f5b6ee9897f05d57969151b6fa9e6e31;hp=-c;p=demo.git

Merge "adjust AAF for b64"
---

941858a8f5b6ee9897f05d57969151b6fa9e6e31
diff --combined heat/ONAP/onap_openstack.yaml
index d836b78e,379c468f..8971c784
--- 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
@@@ -2434,9 -2438,9 +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
+         - path: /opt/config/sample_ca/aaf.signer.b64
            permissions: '0600'
-           content: { get_file: cloud-config/sample_ca/aaf.signer.p12 }
+           content: { get_file: cloud-config/sample_ca/aaf.signer.b64 }
          - path: /etc/init.d/serv.sh
            permissions: '0755'
            content: