x
/
tobiko
Code Issues Proposed changes

Fix CirrOS image fixture configuration (URL, container_format, disk_format) 

Change-Id: I50538ed0c6ed41fd4fa2553c6ad555edb7abcfb7
This commit is contained in:
Federico Ressi 2019-07-05 04:30:47 +02:00
parent 9ec8e520bb
commit b3a8fd1b56
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tobiko/openstack/glance/config.py
View File

@ -36,6 +36,10 @@ def register_tobiko_options(conf):
help="Default CirrOS image URL"),
cfg.StrOpt('image_file',
help="Default CirrOS image filename"),
cfg.StrOpt('container_format',
help="Default CirrOS container format"),
cfg.StrOpt('disk_format',
help="Default CirrOS disk format"),
cfg.StrOpt('username',
help="Default CirrOS username"),
cfg.StrOpt('password',

4
tobiko/openstack/images/_cirros.py
View File

@ -25,8 +25,10 @@ CIRROS_IMAGE_URL = \
class CirrosGlanceImageFixture(glance.URLGlanceImageFixture):
image_url = CIRROS_IMAGE_URL
image_url = CONF.tobiko.cirros.image_url or CIRROS_IMAGE_URL
image_name = CONF.tobiko.cirros.image_name
image_file = CONF.tobiko.cirros.image_file
container_format = CONF.tobiko.cirros.container_format or "bare"
disk_format = CONF.tobiko.cirros.disk_format or "raw"
username = CONF.tobiko.cirros.username or 'cirros'
password = CONF.tobiko.cirros.password or 'gocubsgo'