openstack/rally
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 6699ffde38
2 changed files with 16 additions and 5 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
# enabled, prefixes the MSG part of the syslog message with APP-NAME
# (RFC5424). The format without the APP-NAME is deprecated in I, and
# will be removed in J. (boolean value)
#use_syslog_rfc_format = false
# (RFC5424). The format without the APP-NAME is deprecated in K, and
# will be removed in L, along with this option. (boolean value)
#use_syslog_rfc_format = true
# Syslog facility to receive log lines. (string value)
#syslog_log_facility = LOG_USER
@ -102,9 +102,13 @@
#openstack_client_http_timeout = 180.0
# 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
# 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>
@ -563,6 +567,9 @@
# Cirros image name (string value)
#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]

8
rally/verification/tempest/config.py
View File

@ -41,6 +41,9 @@ IMAGE_OPTS = [
cfg.StrOpt("cirros_image",
default="cirros-0.3.2-x86_64-disk.img",
help="Cirros image name"),
cfg.StrOpt("cirros_base_url",
default="http://download.cirros-cloud.net",
help="Cirros image base URL"),
]
CONF = cfg.CONF
CONF.register_opts(IMAGE_OPTS, "image")
@ -78,8 +81,9 @@ class TempestConf(object):
self._load_img()
def _load_img(self):
cirros_url = ("http://download.cirros-cloud.net/%s/%s" %
(CONF.image.cirros_version,
cirros_url = ("%s/%s/%s" %
(CONF.image.cirros_base_url,
CONF.image.cirros_version,
CONF.image.cirros_image))
try:
response = requests.get(cirros_url, stream=True)