Browse code

Merge "Configure boto.cfg in tempest to point to SSL bundle"

Jenkins authored on 2014/12/10 02:24:30
Showing 1 changed files
... ...
@@ -63,6 +63,7 @@ BUILD_TIMEOUT=${BUILD_TIMEOUT:-196}
63 63
 
64 64
 
65 65
 BOTO_MATERIALS_PATH="$FILES/images/s3-materials/cirros-${CIRROS_VERSION}"
66
+BOTO_CONF=$TEMPEST_DIR/boto.cfg
66 67
 
67 68
 # Cinder/Volume variables
68 69
 TEMPEST_VOLUME_DRIVER=${TEMPEST_VOLUME_DRIVER:-default}
... ...
@@ -424,6 +425,12 @@ function configure_tempest {
424 424
         fi
425 425
     done
426 426
 
427
+    if is_ssl_enabled_service "keystone" || is_service_enabled tls-proxy; then
428
+        # Use the BOTO_CONFIG environment variable to point to this file
429
+        iniset $BOTO_CONF Boto ca_certificates_file $SSL_BUNDLE_FILE
430
+        sudo chown $STACK_USER $BOTO_CONF
431
+    fi
432
+
427 433
     # Restore IFS
428 434
     IFS=$ifs
429 435
 }