summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Sullivan <bryan.sullivan@att.com>2018-01-10 16:21:24 -0800
committerBryan Sullivan <bryan.sullivan@att.com>2018-01-10 16:21:24 -0800
commitc395c70efd7e379a47d86156ca48a397075b899d (patch)
tree791d8c5286cd7bc7d98fd4c2e1f1a08d3c167cfb
parentc02beb3505facd5ab514b9786203d6f73d6a5227 (diff)
Add copy of MCP CA cert if existing into tacker container
JIRA: MODELS-2 Change-Id: I9ee0490b5d78910d1e09a53c0596d9eceb69763c Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>
-rw-r--r--build/tacker/start.sh3
-rw-r--r--tests/utils/tacker-setup.sh5
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}')