openstack/tripleo-common
Code Issues Proposed changes

Merge "Use Timesync service instead of Ntp"

Browse Source
This commit is contained in:
Zuul 2019-01-15 05:07:27 +00:00 committed by Gerrit Code Review
commit 2741a21e2f
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tripleo_common/tests/actions/test_plan.py
View File

@ -82,12 +82,12 @@ SAMPLE_ROLE = """
- InternalApi
HostnameFormatDefault: '%stackname%-sample-%index%'
ServicesDefault:
- OS::TripleO::Services::Ntp
- OS::TripleO::Services::Timesync
"""
SAMPLE_ROLE_OBJ = {
'HostnameFormatDefault': '%stackname%-sample-%index%',
'ServicesDefault': ['OS::TripleO::Services::Ntp'],
'ServicesDefault': ['OS::TripleO::Services::Timesync'],
'description': 'Sample!\n',
'name': 'sample',
'networks': ['InternalApi']
@ -105,12 +105,12 @@ SAMPLE_ROLE_2 = """
- InternalApi
HostnameFormatDefault: '%stackname%-sample-%index%'
ServicesDefault:
- OS::TripleO::Services::Ntp
- OS::TripleO::Services::Timesync
"""
SAMPLE_ROLE_2_OBJ = {
'HostnameFormatDefault': '%stackname%-sample-%index%',
'ServicesDefault': ['OS::TripleO::Services::Ntp'],
'ServicesDefault': ['OS::TripleO::Services::Timesync'],
'description': 'Sample2!\n',
'name': 'sample2',
'networks': ['InternalApi']
@ -130,12 +130,12 @@ UPDATED_ROLE = """
- primary
HostnameFormatDefault: '%stackname%-sample-%index%'
ServicesDefault:
- OS::TripleO::Services::Ntp
- OS::TripleO::Services::Timesync
"""
UPDATED_ROLE_OBJ = {
'HostnameFormatDefault': '%stackname%-sample-%index%',
'ServicesDefault': ['OS::TripleO::Services::Ntp'],
'ServicesDefault': ['OS::TripleO::Services::Timesync'],
'description': 'Sample!\n',
'name': 'sample',
'networks': ['InternalApi', 'ExternalApi'],

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

@ -904,7 +904,7 @@ class TestPrepare(base.TestCase):
}, {
'name': 'BlockStorage',
'ServicesDefault': [
'OS::TripleO::Services::Ntp'
'OS::TripleO::Services::Timesync'
]
}
])
@ -944,7 +944,7 @@ class TestPrepare(base.TestCase):
}, {
'name': 'BlockStorage',
'ServicesDefault': [
'OS::TripleO::Services::Ntp'
'OS::TripleO::Services::Timesync'
]
}
])
@ -999,7 +999,7 @@ class TestPrepare(base.TestCase):
}, {
'name': 'BlockStorage',
'ServicesDefault': [
'OS::TripleO::Services::Ntp'
'OS::TripleO::Services::Timesync'
]
}
])

10
tripleo_common/tests/utils/test_roles.py
View File

@ -32,7 +32,7 @@ SAMPLE_ROLE = """
- InternalApi
HostnameFormatDefault: '%stackname%-sample-%index%'
ServicesDefault:
- OS::TripleO::Services::Ntp
- OS::TripleO::Services::Timesync
"""
SAMPLE_ROLE_NETWORK_DICT = """
###############################################################################
@ -46,7 +46,7 @@ SAMPLE_ROLE_NETWORK_DICT = """
subnet: internal_api_subnet
HostnameFormatDefault: '%stackname%-sample-%index%'
ServicesDefault:
- OS::TripleO::Services::Ntp
- OS::TripleO::Services::Timesync
"""
SAMPLE_GENERATED_ROLE = """
###############################################################################
@ -59,18 +59,18 @@ SAMPLE_GENERATED_ROLE = """
- InternalApi
HostnameFormatDefault: '%stackname%-sample-%index%'
ServicesDefault:
- OS::TripleO::Services::Ntp
- OS::TripleO::Services::Timesync
"""
SAMPLE_ROLE_OBJ = {
'HostnameFormatDefault': '%stackname%-sample-%index%',
'ServicesDefault': ['OS::TripleO::Services::Ntp'],
'ServicesDefault': ['OS::TripleO::Services::Timesync'],
'description': 'Sample!\n',
'name': 'sample',
'networks': ['InternalApi']
}
SAMPLE_ROLE_OBJ_NETWORK_DICT = {
'HostnameFormatDefault': '%stackname%-sample-%index%',
'ServicesDefault': ['OS::TripleO::Services::Ntp'],
'ServicesDefault': ['OS::TripleO::Services::Timesync'],
'description': 'Sample!\n',
'name': 'sample',
'networks': {