From 58689b9fe1ae6c3038a1577eb4a3490750ffb4af Mon Sep 17 00:00:00 2001
From: Instrumental <jonathan.gathman@att.com>
Date: Wed, 5 Sep 2018 12:55:34 -0500
Subject: [PATCH] adjust AAF for b64

HEAT Process did not place binary file as expected. Modified process to
deal with base64

Issue-ID: AAF-420
Change-Id: If9ef925094e131ff556405c99658989677f5bcdf
Signed-off-by: Instrumental <jonathan.gathman@att.com>
---
 heat/ONAP/cloud-config/aaf_vm_init.sh           |   5 ++-
 heat/ONAP/cloud-config/sample_ca/.gitignore     |   1 +
 heat/ONAP/cloud-config/sample_ca/aaf.signer.b64 |  50 ++++++++++++++++++++++++
 heat/ONAP/cloud-config/sample_ca/aaf.signer.p12 | Bin 2850 -> 0 bytes
 heat/ONAP/onap_openstack.yaml                   |   4 +-
 5 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 heat/ONAP/cloud-config/sample_ca/aaf.signer.b64
 delete mode 100644 heat/ONAP/cloud-config/sample_ca/aaf.signer.p12

diff --git a/heat/ONAP/cloud-config/aaf_vm_init.sh b/heat/ONAP/cloud-config/aaf_vm_init.sh
index 883ea30a..3941a30f 100644
--- a/heat/ONAP/cloud-config/aaf_vm_init.sh
+++ b/heat/ONAP/cloud-config/aaf_vm_init.sh
@@ -52,13 +52,14 @@ 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_B64="$CURRENT_DIR/config/sample_ca/aaf.signer.b64"
 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"
+  mkdir -p "$CURRENT_DIR/config/sample_ca"
+  base64 -d $SIGNER_B64 > $SIGNER_P12
 fi
 
 if [ ! -e "$AAF_P12" ]; then
diff --git a/heat/ONAP/cloud-config/sample_ca/.gitignore b/heat/ONAP/cloud-config/sample_ca/.gitignore
index 5f8bc015..cabb364e 100644
--- a/heat/ONAP/cloud-config/sample_ca/.gitignore
+++ b/heat/ONAP/cloud-config/sample_ca/.gitignore
@@ -1 +1,2 @@
+aaf.signer.p12
 aaf.bootstrap.p12
diff --git a/heat/ONAP/cloud-config/sample_ca/aaf.signer.b64 b/heat/ONAP/cloud-config/sample_ca/aaf.signer.b64
new file mode 100644
index 00000000..e561a79a
--- /dev/null
+++ b/heat/ONAP/cloud-config/sample_ca/aaf.signer.b64
@@ -0,0 +1,50 @@
+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
diff --git a/heat/ONAP/cloud-config/sample_ca/aaf.signer.p12 b/heat/ONAP/cloud-config/sample_ca/aaf.signer.p12
deleted file mode 100644
index 8de21238f7167687c8b5aa83622b1fa8a7269f7b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2850
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

diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 65fe4fdc..379c468f 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -2438,9 +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
+        - 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:
-- 
2.16.6