Merge "Convert NTP/PTP enabled flag to string implicitly in DC sync."
This commit is contained in:
commit
df76895de9
|
@ -170,11 +170,11 @@ class SysinvClient(base.DriverBase):
|
||||||
return intp
|
return intp
|
||||||
if ntpservers == "NC":
|
if ntpservers == "NC":
|
||||||
ntpservers = ""
|
ntpservers = ""
|
||||||
if intp.enabled != (enabled == "True") or \
|
if str(intp.enabled) != enabled or \
|
||||||
not self._same_ntpservers(intp.ntpservers, ntpservers):
|
not self._same_ntpservers(intp.ntpservers, ntpservers):
|
||||||
if ntpservers == "":
|
if ntpservers == "":
|
||||||
ntpservers = "NC"
|
ntpservers = "NC"
|
||||||
patch = make_sysinv_patch({'enabled': str(enabled),
|
patch = make_sysinv_patch({'enabled': enabled,
|
||||||
'ntpservers': ntpservers,
|
'ntpservers': ntpservers,
|
||||||
'action': 'apply'})
|
'action': 'apply'})
|
||||||
LOG.info("region={} ntp update uuid={} patch={}".format(
|
LOG.info("region={} ntp update uuid={} patch={}".format(
|
||||||
|
@ -223,11 +223,11 @@ class SysinvClient(base.DriverBase):
|
||||||
LOG.warn("ptp not found %s" % self.region_name)
|
LOG.warn("ptp not found %s" % self.region_name)
|
||||||
return ptp
|
return ptp
|
||||||
|
|
||||||
if ptp.enabled != (enabled == "True") or \
|
if str(ptp.enabled) != enabled or \
|
||||||
ptp.mode != mode or \
|
ptp.mode != mode or \
|
||||||
ptp.transport != transport or \
|
ptp.transport != transport or \
|
||||||
ptp.mechanism != mechanism:
|
ptp.mechanism != mechanism:
|
||||||
patch = make_sysinv_patch({'enabled': str(enabled),
|
patch = make_sysinv_patch({'enabled': enabled,
|
||||||
'mode': mode,
|
'mode': mode,
|
||||||
'transport': transport,
|
'transport': transport,
|
||||||
'mechanism': mechanism})
|
'mechanism': mechanism})
|
||||||
|
|
|
@ -210,7 +210,7 @@ class SysinvSyncThread(SyncThread):
|
||||||
extra=self.log_extra)
|
extra=self.log_extra)
|
||||||
return
|
return
|
||||||
|
|
||||||
intp = self.update_ntp(enabled, ntpservers)
|
intp = self.update_ntp(str(enabled), ntpservers)
|
||||||
|
|
||||||
# Ensure subcloud resource is persisted to the DB for later
|
# Ensure subcloud resource is persisted to the DB for later
|
||||||
subcloud_rsrc_id = self.persist_db_subcloud_resource(
|
subcloud_rsrc_id = self.persist_db_subcloud_resource(
|
||||||
|
@ -291,7 +291,7 @@ class SysinvSyncThread(SyncThread):
|
||||||
extra=self.log_extra)
|
extra=self.log_extra)
|
||||||
return
|
return
|
||||||
|
|
||||||
ptp = self.update_ptp(enabled, mode, transport, mechanism)
|
ptp = self.update_ptp(str(enabled), mode, transport, mechanism)
|
||||||
|
|
||||||
# Ensure subcloud resource is persisted to the DB for later
|
# Ensure subcloud resource is persisted to the DB for later
|
||||||
subcloud_rsrc_id = self.persist_db_subcloud_resource(
|
subcloud_rsrc_id = self.persist_db_subcloud_resource(
|
||||||
|
|
Loading…
Reference in New Issue