openstack/tripleo-common
Code Issues Proposed changes

Merge "Always load rsyslog-base container"

Browse Source
This commit is contained in:
Zuul 2018-03-07 17:45:55 +00:00 committed by Gerrit Code Review
commit f746ad472f
3 changed files with 5 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
container-images/overcloud_containers.yaml.j2
View File

@ -715,7 +715,6 @@ container_images_template:
services:
- OS::TripleO::Services::Tempest
{% if logging == "stdout" %}
- imagename: "{{namespace}}/{{name_prefix}}rsyslog-base{{name_suffix}}:{{tag}}"
params:
- DockerRsyslogSidecarImage
@ -724,4 +723,3 @@ container_images_template:
- OS::TripleO::Services::HAproxy
- OS::TripleO::Services::SwiftProxy
- OS::TripleO::Services::SwiftStorage
{% endif %}

1
tripleo_common/image/kolla_builder.py
View File

@ -35,7 +35,6 @@ CONTAINER_IMAGES_DEFAULTS = {
'name_suffix': '',
'tag': 'current-tripleo',
'neutron_driver': None,
'logging': 'files'
}

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

@ -168,7 +168,6 @@ class TestKollaImageBuilderTemplate(base.TestCase):
'ceph_namespace': 'docker.io/ceph',
'ceph_image': 'daemon',
'ceph_tag': 'tag-stable-3.0-luminous-centos-7',
'logging': 'files',
'name_prefix': 'centos-binary-',
'name_suffix': '',
'tag': 'current-tripleo',
@ -183,7 +182,6 @@ class TestKollaImageBuilderTemplate(base.TestCase):
'ceph_namespace': 'docker.io/cephh',
'ceph_image': 'ceph-daemon',
'ceph_tag': 'latest',
'logging': 'stdout',
'name_prefix': 'prefix-',
'name_suffix': '-suffix',
'tag': 'master',
@ -198,7 +196,6 @@ class TestKollaImageBuilderTemplate(base.TestCase):
name_suffix='suffix',
tag='master',
neutron_driver='ovn',
logging='stdout'
)
)
@ -236,8 +233,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
self.assertEqual(container_images, result)
def _test_container_images_yaml_in_sync_helper(self, neutron_driver=None,
remove_images=[],
logging='files'):
remove_images=[]):
'''Confirm overcloud_containers.tpl.yaml equals overcloud_containers.yaml
TODO(sbaker) remove when overcloud_containers.yaml is deleted
@ -257,7 +253,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
return entry
result = tmpl_builder.container_images_from_template(
filter=ffunc, neutron_driver=neutron_driver, logging=logging)
filter=ffunc, neutron_driver=neutron_driver)
oc_yaml_file = os.path.join(files_dir, 'overcloud_containers.yaml')
yaml_builder = kb.KollaImageBuilder([oc_yaml_file])
@ -290,9 +286,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
{'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
'sb-db-server:current-tripleo'},
{'imagename': 'docker.io/tripleomaster/centos-binary'
'-neutron-metadata-agent-ovn:current-tripleo'},
{'imagename': 'docker.io/tripleomaster/centos-binary'
'-rsyslog-base:current-tripleo'}]
'-neutron-metadata-agent-ovn:current-tripleo'}]
self._test_container_images_yaml_in_sync_helper(
remove_images=remove_images)
@ -314,9 +308,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
{'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
'sb-db-server:current-tripleo'},
{'imagename': 'docker.io/tripleomaster/centos-binary'
'-neutron-metadata-agent-ovn:current-tripleo'},
{'imagename': 'docker.io/tripleomaster/centos-binary'
'-rsyslog-base:current-tripleo'}]
'-neutron-metadata-agent-ovn:current-tripleo'}]
self._test_container_images_yaml_in_sync_helper(
neutron_driver='odl', remove_images=remove_images)
@ -328,35 +320,10 @@ class TestKollaImageBuilderTemplate(base.TestCase):
{'imagename': 'docker.io/tripleomaster/centos-binary'
'-neutron-server-opendaylight:current-tripleo'},
{'imagename': 'docker.io/tripleomaster/centos-binary'
'-opendaylight:current-tripleo'},
{'imagename': 'docker.io/tripleomaster/centos-binary'
'-rsyslog-base:current-tripleo'}]
'-opendaylight:current-tripleo'}]
self._test_container_images_yaml_in_sync_helper(
neutron_driver='ovn', remove_images=remove_images)
def test_container_images_yaml_in_sync_for_stdout_logging(self):
remove_images = [
{'imagename': 'docker.io/tripleomaster/centos-binary'
'-neutron-server-opendaylight:current-tripleo'},
{'imagename': 'docker.io/tripleomaster/centos-binary'
'-neutron-server-ovn:current-tripleo'},
{'imagename': 'docker.io/tripleomaster/centos-binary'
'-ovn-base:current-tripleo'},
{'imagename': 'docker.io/tripleomaster/centos-binary'
'-opendaylight:current-tripleo'},
{'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
'northd:current-tripleo'},
{'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
'controller:current-tripleo'},
{'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
'nb-db-server:current-tripleo'},
{'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
'sb-db-server:current-tripleo'},
{'imagename': 'docker.io/tripleomaster/centos-binary'
'-neutron-metadata-agent-ovn:current-tripleo'}]
self._test_container_images_yaml_in_sync_helper(
remove_images=remove_images, logging='stdout')
class TestPrepare(base.TestCase):