Use Robot password workaround also for RKE

Apply the same workaround in 469b46f7230d9a2512c7c2103f51c7e85f69eb5a
to the RKE deployment script as well.

Change-Id: I9741b3ad52e5bd60cc6c45ae6958898a744409d7
Issue-ID: INT-1016
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

diff --git a/deployment/heat/onap-rke/env/windriver/onap-oom.env b/deployment/heat/onap-rke/env/windriver/onap-oom.env
index bf98171..222040b 100644 (file)
--- a/deployment/heat/onap-rke/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-rke/env/windriver/onap-oom.env
@@ -45,7 +45,7 @@ parameters:
       scriptVersion: "1.3.0"
       rancherIpAddress: "__rancher_ip_addr__"
       config:
-        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED_FOR_ROBOT}"
     so:
       enabled: true
       so-catalog-db-adapter:

diff --git a/deployment/heat/onap-rke/scripts/deploy.sh b/deployment/heat/onap-rke/scripts/deploy.sh
index 17113c1..298e3e7 100755 (executable)
--- a/deployment/heat/onap-rke/scripts/deploy.sh
+++ b/deployment/heat/onap-rke/scripts/deploy.sh
@@ -111,10 +111,13 @@ SSH_KEY=~/.ssh/onap_key
 
 source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh
 
+SO_ENCRYPTION_KEY=aa3871669d893c7fb8abbcda31b88b4f
+export OS_PASSWORD_ENCRYPTED_FOR_ROBOT=$(echo -n "$OS_PASSWORD" | openssl aes-128-ecb -e -K "$SO_ENCRYPTION_KEY" -nosalt | xxd -c 256 -p)
+
 #Use new encryption method
 pushd $WORKSPACE/deployment/heat/onap-rke/scripts
 javac Crypto.java
-SO_ENCRYPTION_KEY=aa3871669d893c7fb8abbcda31b88b4f
+#SO_ENCRYPTION_KEY=aa3871669d893c7fb8abbcda31b88b4f
 export OS_PASSWORD_ENCRYPTED=$(java Crypto "$OS_PASSWORD" "$SO_ENCRYPTION_KEY")
 popd