diff options
| author |   Marco Platania <platania@research.att.com> | 2018-09-04 20:45:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-04 20:45:55 +0000 |
| commit | 2871669ad9a0db36280fd1bcb7ff9d12066d1369 (patch) | |
| tree | 0662fdc76f76e54a11728e68f4db9831abbfb16c /heat/ONAP | |
| parent | 1d16cc3a3c38de445d667b1d25fc560b666aa2d1 (diff) | |
| parent | 60f53a28024568e3f0d84d16f1423f65f0830c9f (diff) | |
Merge "AAF Sample CA change"
Diffstat (limited to 'heat/ONAP')
| -rw-r--r-- | heat/ONAP/cloud-config/aaf_vm_init.sh | 11 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/heat/ONAP/cloud-config/aaf_vm_init.sh b/heat/ONAP/cloud-config/aaf_vm_init.sh index 59486e94..883ea30a 100644 --- a/heat/ONAP/cloud-config/aaf_vm_init.sh +++ b/heat/ONAP/cloud-config/aaf_vm_init.sh @@ -19,7 +19,7 @@ fi echo $NEXUS_DOCKER_REPO HOSTNAME=`hostname -f` FQDN=aaf.api.simpledemo.onap.org -HOST_IP=$(cat /opt/config/local_ip.txt) +HOST_IP=$(cat /opt/config/public_ip.txt) cd /opt/authz/auth/auth-cass/docker if [ "`docker container ls | grep aaf_cass`" = "" ]; then @@ -52,10 +52,15 @@ sed -i "s/HOST_IP=.*/HOST_IP=$HOST_IP/g" /opt/authz/auth/docker/d.props sed -i "s/LATITUDE=.*/LATITUDE=$CADI_LATITUDE/g" /opt/authz/auth/docker/d.props sed -i "s/LONGITUDE=.*/LONGITUDE=$CADI_LONGITUDE/g" /opt/authz/auth/docker/d.props -SIGNER_P12="$CURRENT_DIR/sample_ca/aaf.signer.p12" -AAF_P12="$CURRENT_DIR/sample_ca/aaf.bootstrap.p12" +SIGNER_P12="$CURRENT_DIR/config/sample_ca/aaf.signer.p12" +AAF_P12="$CURRENT_DIR/config/sample_ca/aaf.bootstrap.p12" P12_PASSWORD="something easy" +if [ ! -e "$SIGNER_P12" ]; then + mkdir -p "$CURRENT_DIR/sample_ca" + cp /opt/authz/conf/onap.sample.signer.p12 "$SIGNER_P12" +fi + if [ ! -e "$AAF_P12" ]; then mkdir -p $CURRENT_DIR/sample_ca cd /opt/authz/conf/CA diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 2053c9d0..65fe4fdc 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -2438,6 +2438,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: @@ -2465,6 +2468,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 |