Sandro Bonazzola has uploaded a new change for review.
Change subject: packaging: setup: bridge name in hosted-engine.conf
......................................................................
packaging: setup: bridge name in hosted-engine.conf
Added bridge key in hosted-engine.conf allowing the
HA agent to parse it in an easy way.
The value is now assigned from environment variable
instead of being hardcoded in the template
Change-Id: I698d6e7609ef20dff0426b07028ca3391e82a0d7
Signed-off-by: Sandro Bonazzola <sbona...@redhat.com>
---
M src/plugins/ovirt-hosted-engine-setup/core/conf.py
M src/plugins/ovirt-hosted-engine-setup/vm/configurevm.py
M templates/hosted-engine.conf.in
M templates/vm.conf.in
4 files changed, 8 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-hosted-engine-setup
refs/changes/13/19413/1
diff --git a/src/plugins/ovirt-hosted-engine-setup/core/conf.py
b/src/plugins/ovirt-hosted-engine-setup/core/conf.py
index e40c502..456edb2 100644
--- a/src/plugins/ovirt-hosted-engine-setup/core/conf.py
+++ b/src/plugins/ovirt-hosted-engine-setup/core/conf.py
@@ -93,6 +93,9 @@
self.environment[ohostedcons.VDSMEnv.USE_SSL]
).lower(),
'@GATEWAY@': self.environment[ohostedcons.NetworkEnv.GATEWAY],
+ '@BRIDGE@': self.environment[
+ ohostedcons.NetworkEnv.BRIDGE_NAME
+ ],
}
)
with transaction.Transaction() as localtransaction:
diff --git a/src/plugins/ovirt-hosted-engine-setup/vm/configurevm.py
b/src/plugins/ovirt-hosted-engine-setup/vm/configurevm.py
index 6f9b174..7d848ae 100644
--- a/src/plugins/ovirt-hosted-engine-setup/vm/configurevm.py
+++ b/src/plugins/ovirt-hosted-engine-setup/vm/configurevm.py
@@ -199,6 +199,9 @@
'@CONSOLE_UUID@': self.environment[
ohostedcons.VMEnv.CONSOLE_UUID
],
+ '@BRIDGE@': self.environment[
+ ohostedcons.NetworkEnv.BRIDGE_NAME
+ ],
}
if self.environment[
ohostedcons.VMEnv.BOOT
diff --git a/templates/hosted-engine.conf.in b/templates/hosted-engine.conf.in
index 854786b..3e27506 100644
--- a/templates/hosted-engine.conf.in
+++ b/templates/hosted-engine.conf.in
@@ -14,3 +14,4 @@
ca_subject="@CA_SUBJECT@"
vdsm_use_ssl=@VDSM_USE_SSL@
gateway=@GATEWAY@
+bridge=@BRIDGE@
diff --git a/templates/vm.conf.in b/templates/vm.conf.in
index c60f044..0207f91 100644
--- a/templates/vm.conf.in
+++ b/templates/vm.conf.in
@@ -4,7 +4,7 @@
devices={index:2,iface:ide,address:{ controller:0, target:0,unit:0, bus:1,
type:drive},specParams:{},readonly:true,deviceId:@CDROM_UUID@,path:@CDROM@,device:cdrom,shared:false,type:disk}
devices={index:0,iface:virtio,format:raw,poolID:@SP_UUID@,volumeID:@VOL_UUID@,imageID:@IMG_UUID@,specParams:{},readonly:false,domainID:@SD_UUID@,optional:false,deviceId:@IMG_UUID@,address:{bus:0x00,
slot:0x06, domain:0x0000, type:pci,
function:0x0},device:disk,shared:exclusive,propagateErrors:off,type:disk}
devices={device:scsi,model:virtio-scsi,type:controller}
-devices={nicModel:pv,macAddr:@MAC_ADDR@,linkActive:true,network:ovirtmgmt,filter:vdsm-no-mac-spoofing,specParams:{},deviceId:@NIC_UUID@,address:{bus:0x00,
slot:0x03, domain:0x0000, type:pci, function:0x0},device:bridge,type:interface}
+devices={nicModel:pv,macAddr:@MAC_ADDR@,linkActive:true,network:@BRIDGE@,filter:vdsm-no-mac-spoofing,specParams:{},deviceId:@NIC_UUID@,address:{bus:0x00,
slot:0x03, domain:0x0000, type:pci, function:0x0},device:bridge,type:interface}
devices={device:console,specParams:{},type:console,deviceId:@CONSOLE_UUID@,alias:console0}
boot=@BOOT@
vmName=@NAME@
--
To view, visit http://gerrit.ovirt.org/19413
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I698d6e7609ef20dff0426b07028ca3391e82a0d7
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-hosted-engine-setup
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
