Simone Tiraboschi has uploaded a new change for review. Change subject: packaging: setup: adding prepareImage to the connectStorage cmd ......................................................................
packaging: setup: adding prepareImage to the connectStorage cmd Now VDSM explictly needs prepareImage to be called to made the image availables. Adding it. Change-Id: Ia01b5cde784ff9589cad2e7ef025c839f3fd49d3 Bug-Url: https://bugzilla.redhat.com/1215967 Signed-off-by: Simone Tiraboschi <stira...@redhat.com> --- M src/bin/hosted-engine.in M src/plugins/ovirt-hosted-engine-setup/core/conf.py M templates/hosted-engine.conf.in 3 files changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-hosted-engine-setup refs/changes/93/42393/1 diff --git a/src/bin/hosted-engine.in b/src/bin/hosted-engine.in index f081e3c..9efd5b0 100644 --- a/src/bin/hosted-engine.in +++ b/src/bin/hosted-engine.in @@ -21,6 +21,8 @@ HOSTED_ENGINE_CONF='/etc/ovirt-hosted-engine/hosted-engine.conf' PKI_GUIDE_URL='https://fedoraproject.org/wiki/QA:Testcase_Virtualization_Manually_set_spice_listening_port_with_TLS_port_set' +blankUUID='00000000-0000-0000-0000-000000000000' + if [ -r "${HOSTED_ENGINE_CONF}" ] ; then source "${HOSTED_ENGINE_CONF}" fi @@ -292,6 +294,11 @@ "${spUUID}" \ connection="${storage},user=kvm,id=${connectionUUID},protocol_version=${protocol_version}" fi + echo "Preparing images" + ${VDSCOMMAND} prepareImage "${blankUUID}" "${sdUUID}" "${vm_disk_id}" "${vm_disk_vol_id}" + ${VDSCOMMAND} prepareImage "${blankUUID}" "${sdUUID}" "${metadata_image_UUID}" "${metadata_volume_UUID}" + ${VDSCOMMAND} prepareImage "${blankUUID}" "${sdUUID}" "${lockspace_image_UUID}" "${lockspace_volume_UUID}" + ${VDSCOMMAND} prepareImage "${blankUUID}" "${sdUUID}" "${conf_image_UUID}" "${conf_volume_UUID}" } cmd_start_pool() { diff --git a/src/plugins/ovirt-hosted-engine-setup/core/conf.py b/src/plugins/ovirt-hosted-engine-setup/core/conf.py index a20dd4f..b945219 100644 --- a/src/plugins/ovirt-hosted-engine-setup/core/conf.py +++ b/src/plugins/ovirt-hosted-engine-setup/core/conf.py @@ -56,7 +56,6 @@ name=ohostedcons.Stages.SAVE_CONFIG, ) def _misc(self): - # TODO: what's an VM_DISK_ID and how can it change to another value? self.logger.info(_('Updating hosted-engine configuration')) subst = { '@FQDN@': self.environment[ @@ -65,6 +64,9 @@ '@VM_DISK_ID@': self.environment[ ohostedcons.StorageEnv.IMG_UUID ], + '@VM_DISK_VOL_ID@': self.environment[ + ohostedcons.StorageEnv.VOL_UUID + ], '@SHARED_STORAGE@': self.environment[ ohostedcons.StorageEnv.STORAGE_DOMAIN_CONNECTION ], diff --git a/templates/hosted-engine.conf.in b/templates/hosted-engine.conf.in index c184944..f26bb85 100644 --- a/templates/hosted-engine.conf.in +++ b/templates/hosted-engine.conf.in @@ -1,5 +1,6 @@ fqdn=@FQDN@ vm_disk_id=@VM_DISK_ID@ +vm_disk_vol_id=@VM_DISK_VOL_ID@ vmid=@VM_UUID@ storage=@SHARED_STORAGE@ conf=@CONF_FILE@ -- To view, visit https://gerrit.ovirt.org/42393 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia01b5cde784ff9589cad2e7ef025c839f3fd49d3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-hosted-engine-setup Gerrit-Branch: master Gerrit-Owner: Simone Tiraboschi <stira...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
