diff options
Diffstat (limited to 'heat/ONAP/onap_openstack.yaml')
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index d258d71d..fba9bfb4 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 @@ -2447,6 +2443,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.b64 + permissions: '0600' + content: { get_file: cloud-config/sample_ca/aaf.signer.b64 } - path: /etc/init.d/serv.sh permissions: '0755' content: @@ -2474,6 +2473,7 @@ resources: #!/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 |