aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-09-05 13:15:52 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-09-05 13:15:52 -0700
commita4e1bb47a6dd8883bd7033ebbff4f95c5b6279fa (patch)
tree36d97c29d203a936bf3a19194bd2bd0ed2189cf1
parentb2246f534206ccf60245ac51474b7e1f2c31414c (diff)
Remove plain OpenStack pwd from Heat
Replace plain OpenStack password with its encrypted version Change-Id: I3afd8c02ce7d004a2817bad69a667edb28982f67 Issue-ID: INT-646 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rw-r--r--test/ete/labs/gwu/onap-openstack-template.env4
-rw-r--r--test/ete/labs/huawei/onap-openstack-template.env4
-rw-r--r--test/ete/labs/tlab/onap-openstack-template.env4
-rw-r--r--test/ete/labs/windriver/onap-openstack-template.env4
-rwxr-xr-xtest/ete/scripts/deploy-onap.sh2
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