openstack/tripleo-common
Code Issues Proposed changes

Use Timesync service instead of Ntp

Browse Source 
At the moment the 'OS::TripleO::Services::Timesync' service is
synonymous to 'OS::TripleO::Services::Ntp'. Let's use the more generic
Timesync service to pick up the new default in the event the value for
'OS::TripleO::Services::Timesync' changes.

Change-Id: I10704670ea57902add783e2473eeeaa72bf5eacf
This commit is contained in:
wangqi 2018-10-11 10:16:38 +00:00
parent 024a359e12
commit 38e6034f94
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 - InternalApi
HostnameFormatDefault: '%stackname%-sample-%index%' HostnameFormatDefault: '%stackname%-sample-%index%'
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::Ntp - OS::TripleO::Services::Timesync
""" """
SAMPLE_ROLE_OBJ = { SAMPLE_ROLE_OBJ = {
'HostnameFormatDefault': '%stackname%-sample-%index%', 'HostnameFormatDefault': '%stackname%-sample-%index%',
'ServicesDefault': ['OS::TripleO::Services::Ntp'], 'ServicesDefault': ['OS::TripleO::Services::Timesync'],
'description': 'Sample!\n', 'description': 'Sample!\n',
'name': 'sample', 'name': 'sample',
'networks': ['InternalApi'] 'networks': ['InternalApi']
@ -105,12 +105,12 @@ SAMPLE_ROLE_2 = """
- InternalApi - InternalApi
HostnameFormatDefault: '%stackname%-sample-%index%' HostnameFormatDefault: '%stackname%-sample-%index%'
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::Ntp - OS::TripleO::Services::Timesync
""" """
SAMPLE_ROLE_2_OBJ = { SAMPLE_ROLE_2_OBJ = {
'HostnameFormatDefault': '%stackname%-sample-%index%', 'HostnameFormatDefault': '%stackname%-sample-%index%',
'ServicesDefault': ['OS::TripleO::Services::Ntp'], 'ServicesDefault': ['OS::TripleO::Services::Timesync'],
'description': 'Sample2!\n', 'description': 'Sample2!\n',
'name': 'sample2', 'name': 'sample2',
'networks': ['InternalApi'] 'networks': ['InternalApi']
@ -130,12 +130,12 @@ UPDATED_ROLE = """
- primary - primary
HostnameFormatDefault: '%stackname%-sample-%index%' HostnameFormatDefault: '%stackname%-sample-%index%'
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::Ntp - OS::TripleO::Services::Timesync
""" """
UPDATED_ROLE_OBJ = { UPDATED_ROLE_OBJ = {
'HostnameFormatDefault': '%stackname%-sample-%index%', 'HostnameFormatDefault': '%stackname%-sample-%index%',
'ServicesDefault': ['OS::TripleO::Services::Ntp'], 'ServicesDefault': ['OS::TripleO::Services::Timesync'],
'description': 'Sample!\n', 'description': 'Sample!\n',
'name': 'sample', 'name': 'sample',
'networks': ['InternalApi', 'ExternalApi'], 'networks': ['InternalApi', 'ExternalApi'],

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

@ -710,7 +710,7 @@ class TestPrepare(base.TestCase):
}, { }, {
'name': 'BlockStorage', 'name': 'BlockStorage',
'ServicesDefault': [ 'ServicesDefault': [
'OS::TripleO::Services::Ntp' 'OS::TripleO::Services::Timesync'
] ]
} }
]) ])
@ -750,7 +750,7 @@ class TestPrepare(base.TestCase):
}, { }, {
'name': 'BlockStorage', 'name': 'BlockStorage',
'ServicesDefault': [ 'ServicesDefault': [
'OS::TripleO::Services::Ntp' 'OS::TripleO::Services::Timesync'
] ]
} }
]) ])
@ -805,7 +805,7 @@ class TestPrepare(base.TestCase):
}, { }, {
'name': 'BlockStorage', 'name': 'BlockStorage',
'ServicesDefault': [ '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 - InternalApi
HostnameFormatDefault: '%stackname%-sample-%index%' HostnameFormatDefault: '%stackname%-sample-%index%'
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::Ntp - OS::TripleO::Services::Timesync
""" """
SAMPLE_ROLE_NETWORK_DICT = """ SAMPLE_ROLE_NETWORK_DICT = """
############################################################################### ###############################################################################
@ -46,7 +46,7 @@ SAMPLE_ROLE_NETWORK_DICT = """
subnet: internal_api_subnet subnet: internal_api_subnet
HostnameFormatDefault: '%stackname%-sample-%index%' HostnameFormatDefault: '%stackname%-sample-%index%'
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::Ntp - OS::TripleO::Services::Timesync
""" """
SAMPLE_GENERATED_ROLE = """ SAMPLE_GENERATED_ROLE = """
############################################################################### ###############################################################################
@ -59,18 +59,18 @@ SAMPLE_GENERATED_ROLE = """
- InternalApi - InternalApi
HostnameFormatDefault: '%stackname%-sample-%index%' HostnameFormatDefault: '%stackname%-sample-%index%'
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::Ntp - OS::TripleO::Services::Timesync
""" """
SAMPLE_ROLE_OBJ = { SAMPLE_ROLE_OBJ = {
'HostnameFormatDefault': '%stackname%-sample-%index%', 'HostnameFormatDefault': '%stackname%-sample-%index%',
'ServicesDefault': ['OS::TripleO::Services::Ntp'], 'ServicesDefault': ['OS::TripleO::Services::Timesync'],
'description': 'Sample!\n', 'description': 'Sample!\n',
'name': 'sample', 'name': 'sample',
'networks': ['InternalApi'] 'networks': ['InternalApi']
} }
SAMPLE_ROLE_OBJ_NETWORK_DICT = { SAMPLE_ROLE_OBJ_NETWORK_DICT = {
'HostnameFormatDefault': '%stackname%-sample-%index%', 'HostnameFormatDefault': '%stackname%-sample-%index%',
'ServicesDefault': ['OS::TripleO::Services::Ntp'], 'ServicesDefault': ['OS::TripleO::Services::Timesync'],
'description': 'Sample!\n', 'description': 'Sample!\n',
'name': 'sample', 'name': 'sample',
'networks': { 'networks': {