openstack/rally-openstack
Code Issues Proposed changes

Merge "Added configuration parameter for cirros base url"

Browse Source
This commit is contained in:
Jenkins 2015-05-15 10:58:18 +00:00 committed by Gerrit Code Review
commit 0ac401315b
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
etc/rally/rally.conf.sample
View File

@ -45,9 +45,9 @@
# (Optional) Enables or disables syslog rfc5424 format for logging. If # (Optional) Enables or disables syslog rfc5424 format for logging. If
# enabled, prefixes the MSG part of the syslog message with APP-NAME # enabled, prefixes the MSG part of the syslog message with APP-NAME
# (RFC5424). The format without the APP-NAME is deprecated in I, and # (RFC5424). The format without the APP-NAME is deprecated in K, and
# will be removed in J. (boolean value) # will be removed in L, along with this option. (boolean value)
#use_syslog_rfc_format = false #use_syslog_rfc_format = true
# Syslog facility to receive log lines. (string value) # Syslog facility to receive log lines. (string value)
#syslog_log_facility = LOG_USER #syslog_log_facility = LOG_USER
@ -102,9 +102,13 @@
#openstack_client_http_timeout = 180.0 #openstack_client_http_timeout = 180.0
# Use SSL for all OpenStack API interfaces (boolean value) # Use SSL for all OpenStack API interfaces (boolean value)
# This option is deprecated for removal.
# Its value may be silently ignored in the future.
#https_insecure = false #https_insecure = false
# Path to CA server cetrificate for SSL (string value) # Path to CA server cetrificate for SSL (string value)
# This option is deprecated for removal.
# Its value may be silently ignored in the future.
#https_cacert = <None> #https_cacert = <None>
@ -563,6 +567,9 @@
# Cirros image name (string value) # Cirros image name (string value)
#cirros_image = cirros-0.3.2-x86_64-disk.img #cirros_image = cirros-0.3.2-x86_64-disk.img
# Cirros image base URL (string value)
#cirros_base_url = http://download.cirros-cloud.net
[users_context] [users_context]