diff options
author | Marco Platania <platania@research.att.com> | 2018-09-05 14:26:34 -0400 |
---|---|---|
committer | Marco Platania <platania@research.att.com> | 2018-09-05 14:26:34 -0400 |
commit | 8c1c99dfc4a42ff8e438a13858c95340a0f677c7 (patch) | |
tree | ca41ad656c7c8383faeeb58edd2617a45dc096d8 /heat/ONAP/cloud-config | |
parent | 2871669ad9a0db36280fd1bcb7ff9d12066d1369 (diff) |
Remove plain OpenStack pwd from Heat
- Replace plain OpenStack password with its encrypted version
- Update SO install/init script to skip key encryption (will be done by user)
- Provide a script that encrypts the plain OpenStack password
Change-Id: Ifb7010ab8720ca92119c65484d05f5cfacf023cb
Issue-ID: INT-646
Signed-off-by: Marco Platania <platania@research.att.com>
Diffstat (limited to 'heat/ONAP/cloud-config')
-rw-r--r-- | heat/ONAP/cloud-config/so_install.sh | 6 | ||||
-rw-r--r-- | heat/ONAP/cloud-config/so_vm_init.sh | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/heat/ONAP/cloud-config/so_install.sh b/heat/ONAP/cloud-config/so_install.sh index 3a8f3fc2..36c7c8cb 100644 --- a/heat/ONAP/cloud-config/so_install.sh +++ b/heat/ONAP/cloud-config/so_install.sh @@ -1,7 +1,7 @@ #!/bin/bash # Read configuration files -OPENSTACK_API_KEY=$(cat /opt/config/openstack_api_key.txt) +#OPENSTACK_API_KEY=$(cat /opt/config/openstack_api_key.txt) GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) CODE_REPO=$(cat /opt/config/remote_repo.txt) HTTP_PROXY=$(cat /opt/config/http_proxy.txt) @@ -16,7 +16,7 @@ fi # Clone Gerrit repository and run docker containers. cd /opt git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO test_lab -SO_ENCRYPTION_KEY=$(cat /opt/test_lab/encryption.key) -echo -n "$OPENSTACK_API_KEY" | openssl aes-128-ecb -e -K $SO_ENCRYPTION_KEY -nosalt | xxd -c 256 -p > /opt/config/api_key.txt +#SO_ENCRYPTION_KEY=$(cat /opt/test_lab/encryption.key) +#echo -n "$OPENSTACK_API_KEY" | openssl aes-128-ecb -e -K $SO_ENCRYPTION_KEY -nosalt | xxd -c 256 -p > /opt/config/api_key.txt ./so_vm_init.sh diff --git a/heat/ONAP/cloud-config/so_vm_init.sh b/heat/ONAP/cloud-config/so_vm_init.sh index fb19d1a3..1acf2eb0 100644 --- a/heat/ONAP/cloud-config/so_vm_init.sh +++ b/heat/ONAP/cloud-config/so_vm_init.sh @@ -5,7 +5,8 @@ NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) DMAAP_TOPIC=$(cat /opt/config/dmaap_topic.txt) OPENSTACK_USERNAME=$(cat /opt/config/openstack_username.txt) -OPENSTACK_APIKEY=$(cat /opt/config/api_key.txt) +#OPENSTACK_APIKEY=$(cat /opt/config/api_key.txt) +OPENSTACK_APIKEY=$(cat /opt/config/openstack_api_key.txt) export MSO_DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) |