5 files changed, 6 insertions, 12 deletions
diff --git a/test/ete/labs/gwu/onap-openstack-template.env b/test/ete/labs/gwu/onap-openstack-template.env
index 3071356e6..53139b542 100644
--- a/test/ete/labs/gwu/onap-openstack-template.env
+++ b/test/ete/labs/gwu/onap-openstack-template.env
@@ -46,9 +46,7 @@ parameters:
 
   openstack_username: ${OS_USERNAME}
 
-  openstack_api_key: ${OS_PASSWORD}
-
-  openstack_auth_method: password
+  openstack_api_key: ${OS_PASSWORD_ENCRYPTED}
 
   openstack_region: RegionOne
 
diff --git a/test/ete/labs/huawei/onap-openstack-template.env b/test/ete/labs/huawei/onap-openstack-template.env
index c682dc5cf..e6e2a2cbf 100644
--- a/test/ete/labs/huawei/onap-openstack-template.env
+++ b/test/ete/labs/huawei/onap-openstack-template.env
@@ -46,9 +46,7 @@ parameters:
 
   openstack_username: ${OS_USERNAME}
 
-  openstack_api_key: ${OS_PASSWORD}
-
-  openstack_auth_method: password
+  openstack_api_key: ${OS_PASSWORD_ENCRYPTED}
 
   openstack_region: RegionOne
 
diff --git a/test/ete/labs/tlab/onap-openstack-template.env b/test/ete/labs/tlab/onap-openstack-template.env
index feded7faf..dcdb7d574 100644
--- a/test/ete/labs/tlab/onap-openstack-template.env
+++ b/test/ete/labs/tlab/onap-openstack-template.env
@@ -46,9 +46,7 @@ parameters:
 
   openstack_username: ${OS_USERNAME}
 
-  openstack_api_key: ${OS_PASSWORD}
-
-  openstack_auth_method: password
+  openstack_api_key: ${OS_PASSWORD_ENCRYPTED}
 
   openstack_region: RegionOne
 
diff --git a/test/ete/labs/windriver/onap-openstack-template.env b/test/ete/labs/windriver/onap-openstack-template.env
index b18bd62c1..90d901d79 100644
--- a/test/ete/labs/windriver/onap-openstack-template.env
+++ b/test/ete/labs/windriver/onap-openstack-template.env
@@ -46,9 +46,7 @@ parameters:
 
   openstack_username: ${OS_USERNAME}
 
-  openstack_api_key: ${OS_PASSWORD}
-
-  openstack_auth_method: password
+  openstack_api_key: ${OS_PASSWORD_ENCRYPTED}
 
   openstack_region: RegionOne
 
diff --git a/test/ete/scripts/deploy-onap.sh b/test/ete/scripts/deploy-onap.sh
index 2fd05562a..6c8d05d41 100755
--- a/test/ete/scripts/deploy-onap.sh
+++ b/test/ete/scripts/deploy-onap.sh
@@ -19,6 +19,8 @@ fi
 
 source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh
 
+SO_ENCRYPTION_KEY=aa3871669d893c7fb8abbcda31b88b4f
+export OS_PASSWORD_ENCRYPTED=$(echo -n "$OS_PASSWORD" | openssl aes-128-ecb -e -K "$SO_ENCRYPTION_KEY" -nosalt | xxd -c 256 -p)
 
 DEMO_DIR=${ONAP_WORKDIR}/demo
 if [ "$#" -ge 2 ]; then