From 76055524ba94690af419420d933ff6eeac79a3b9 Mon Sep 17 00:00:00 2001 From: Ignatious Johnson Christopher Date: Thu, 25 Aug 2016 12:18:08 -0700 Subject: [PATCH] Provisioning ssl parameters in heat conifg files. Change-Id: I982b74ea9c760d8679aedf0cb2902a72f457efed Closes-Bug: 1658753 (cherry picked from commit 3038283980d8f4ce3d3fffe9b105d7a74d044aaf) --- .../openstack/scripts/heat-server-setup.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/contrail_provisioning/openstack/scripts/heat-server-setup.sh b/contrail_provisioning/openstack/scripts/heat-server-setup.sh index 19e65d0e..514454f8 100755 --- a/contrail_provisioning/openstack/scripts/heat-server-setup.sh +++ b/contrail_provisioning/openstack/scripts/heat-server-setup.sh @@ -149,8 +149,11 @@ for svc in heat; do openstack-config --set /etc/$svc/$svc.conf keystone_authtoken auth_host $controller_ip openstack-config --set /etc/$svc/$svc.conf keystone_authtoken auth_port 35357 openstack-config --set /etc/$svc/$svc.conf keystone_authtoken auth_protocol $AUTH_PROTOCOL - if [ $KEYSTONE_INSECURE == "True" ]; then - openstack-config --set /etc/$svc/$svc.conf keystone_authtoken insecure $KEYSTONE_INSECURE + if [ $AUTH_PROTOCOL == "https" ]; then + openstack-config --set /etc/$svc/$svc.conf keystone_authtoken insecure True + openstack-config --set /etc/$svc/$svc.conf clients_keystone insecure True + openstack-config --set /etc/$svc/$svc.conf clients_neutron insecure True + openstack-config --set /etc/$svc/$svc.conf clients_contrail use_ssl True fi openstack-config --set /etc/$svc/$svc.conf keystone_authtoken admin_tenant_name service openstack-config --set /etc/$svc/$svc.conf keystone_authtoken admin_user $svc