diff options
-rw-r--r-- | build/tacker/start.sh | 3 | ||||
-rw-r--r-- | tests/utils/tacker-setup.sh | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/build/tacker/start.sh b/build/tacker/start.sh index b824589..c948d62 100644 --- a/build/tacker/start.sh +++ b/build/tacker/start.sh @@ -33,6 +33,9 @@ mysql --user=root --password=$MYSQL_PASSWORD -e "CREATE DATABASE tacker; GRANT A log "Setup OpenStack CLI environment" source /opt/tacker/admin-openrc.sh +if [[ -f /opt/tacker/mcp_os_cacert ]]; then + cp /opt/tacker/mcp_os_cacert /etc/ssl/certs/mcp_os_cacert +fi uid=$(openstack user list | awk "/ tacker / { print \$2 }") if [[ $uid ]]; then diff --git a/tests/utils/tacker-setup.sh b/tests/utils/tacker-setup.sh index 5ebf1f4..569840b 100644 --- a/tests/utils/tacker-setup.sh +++ b/tests/utils/tacker-setup.sh @@ -94,7 +94,10 @@ EOF sudo mkdir -p /opt/tacker sudo chown $USER /opt/tacker cp $openrc /opt/tacker/admin-openrc.sh - + if [[ -f /etc/ssl/certs/mcp_os_cacert ]]; then + cp /etc/ssl/certs/mcp_os_cacert /opt/tacker/mcp_os_cacert + fi + if [[ "$branch" == "" ]]; then branch="latest"; fi log "Start tacker container with image blsaws/models-tacker:$branch" OS_TENANT_ID=$(openstack project show admin | awk '/ id / {print $4}') |