From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Fri, 19 Jan 2018 15:42:46 +0000 (-0500)
Subject: Do not hardcode user/password of DNSaaS instance
X-Git-Tag: 1.0.1-Amsterdam^0
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=demo.git;a=commitdiff_plain;h=b67a797a9494c385a8bdaff381ec8dbf460c788e

Do not hardcode user/password of DNSaaS instance

User already has the possibility to provide the username/password,
but the script is using hardcoded values. Let's use instead the
user specific ones.

Change-Id: Ice6ab80e039b437c16f0b8882b4b3e195a927653
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
Issue-ID: DCAEGEN2-270
---

diff --git a/boot/dcae2_vm_init.sh b/boot/dcae2_vm_init.sh
index b071dffd..0ae1549a 100755
--- a/boot/dcae2_vm_init.sh
+++ b/boot/dcae2_vm_init.sh
@@ -160,8 +160,8 @@ register_multicloud_pod25dns_with_aai()
     local CLOUD_ENV
     local CLOUD_IDENTITY_URL
     local DNSAAS_SERVICE_URL
-    local DNSAAS_USERNAME='demo'
-    local DNSAAS_PASSWORD='onapdemo'
+    local DNSAAS_USERNAME="$(cat /opt/config/dnsaas_username.txt)"
+    local DNSAAS_PASSWORD="$(cat /opt/config/dnsaas_password.txt)"
 
     CLOUD_REGION="$(cat /opt/config/dnsaas_region.txt)"
     CLOUD_ENV="$(cat /opt/config/cloud_env.txt)"