Merge "Add ostree commit id to software show api"
This commit is contained in:
commit
a10bb79e8e
|
@ -2513,6 +2513,8 @@ class PatchController(PatchService):
|
||||||
LOG.exception(msg)
|
LOG.exception(msg)
|
||||||
raise MetadataFail(msg)
|
raise MetadataFail(msg)
|
||||||
|
|
||||||
|
self.release_data.metadata[release]["commit"] = self.latest_feed_commit
|
||||||
|
|
||||||
if not os.path.isfile(INITIAL_CONTROLLER_CONFIG_COMPLETE):
|
if not os.path.isfile(INITIAL_CONTROLLER_CONFIG_COMPLETE):
|
||||||
self.release_data.metadata[release]["state"] = constants.DEPLOYING_START
|
self.release_data.metadata[release]["state"] = constants.DEPLOYING_START
|
||||||
elif len(self.hosts) > 0:
|
elif len(self.hosts) > 0:
|
||||||
|
@ -2642,6 +2644,8 @@ class PatchController(PatchService):
|
||||||
self.interim_state[release] = list(self.hosts)
|
self.interim_state[release] = list(self.hosts)
|
||||||
|
|
||||||
if removed:
|
if removed:
|
||||||
|
self.latest_feed_commit = ostree_utils.get_feed_latest_commit(SW_VERSION)
|
||||||
|
self.release_data.metadata[release]["commit"] = self.latest_feed_commit
|
||||||
try:
|
try:
|
||||||
metadata_dir = DEPLOY_STATE_METADATA_DIR_DICT[deploystate]
|
metadata_dir = DEPLOY_STATE_METADATA_DIR_DICT[deploystate]
|
||||||
shutil.move("%s/%s-metadata.xml" % (metadata_dir, deployment),
|
shutil.move("%s/%s-metadata.xml" % (metadata_dir, deployment),
|
||||||
|
|
|
@ -335,6 +335,8 @@ class ReleaseData(object):
|
||||||
|
|
||||||
self.metadata[release_id]["sw_version"] = "unknown"
|
self.metadata[release_id]["sw_version"] = "unknown"
|
||||||
|
|
||||||
|
# commit is derived from apt-ostree command run in software deploy start
|
||||||
|
|
||||||
for key in ["status",
|
for key in ["status",
|
||||||
"unremovable",
|
"unremovable",
|
||||||
"sw_version",
|
"sw_version",
|
||||||
|
@ -343,7 +345,8 @@ class ReleaseData(object):
|
||||||
"install_instructions",
|
"install_instructions",
|
||||||
"restart_script",
|
"restart_script",
|
||||||
"warnings",
|
"warnings",
|
||||||
"apply_active_release_only"]:
|
"apply_active_release_only",
|
||||||
|
"commit"]:
|
||||||
value = root.findtext(key)
|
value = root.findtext(key)
|
||||||
if value is not None:
|
if value is not None:
|
||||||
self.metadata[release_id][key] = value
|
self.metadata[release_id][key] = value
|
||||||
|
|
Loading…
Reference in New Issue