openstack/tripleo-common
Code Issues Proposed changes

Merge "Include a default for tag_from_label"

Browse Source
This commit is contained in:
Zuul
2018-03-08 18:39:13 +00:00
committed by Gerrit Code Review
parent e701aca541 313b085c37
commit 0c142000fb
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tripleo_common/image/kolla_builder.py
View File

@@ -33,6 +33,7 @@ CONTAINER_IMAGES_DEFAULTS = {
'ceph_tag': 'tag-stable-3.0-luminous-centos-7',
'name_prefix': 'centos-binary-',
'name_suffix': '',
'tag_from_label': 'rdo_version',
'tag': 'current-tripleo',
'neutron_driver': None,
}

2
tripleo_common/tests/image/test_kolla_builder.py
View File

@@ -171,6 +171,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
'name_prefix': 'centos-binary-',
'name_suffix': '',
'tag': 'current-tripleo',
'tag_from_label': 'rdo_version',
'neutron_driver': None
},
builder.container_images_template_inputs()
@@ -185,6 +186,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
'name_prefix': 'prefix-',
'name_suffix': '-suffix',
'tag': 'master',
'tag_from_label': 'rdo_version',
'neutron_driver': 'ovn'
},
builder.container_images_template_inputs(