opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: RHEL fsdirver fail to deploy networking scripts

Browse Source
This commit is contained in:
Qiu Jian
2019-03-11 09:35:31 +08:00
parent 53435a2528
commit 5fbebfaa81
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/guestfs/fsdriver/linux.go
+21 -1
View File
@@ -785,7 +785,7 @@ func (r *sRedhatLikeRootFs) enableBondingModule(rootFs IDiskPartition, bondNics
for i := range bondNics {
content.WriteString("alias ")
content.WriteString(bondNics[i].Name)
content.WriteString("bonding\n options ")
content.WriteString(" bonding\n options ")
content.WriteString(bondNics[i].Name)
content.WriteString(" miimon=100 mode=4 lacp_rate=1 xmit_hash_policy=1\n")
}
@@ -793,6 +793,10 @@ func (r *sRedhatLikeRootFs) enableBondingModule(rootFs IDiskPartition, bondNics
}
func (r *sRedhatLikeRootFs) deployNetworkingScripts(rootFs IDiskPartition, nics []jsonutils.JSONObject, relInfo *SReleaseInfo) error {
if err := r.sLinuxRootFs.DeployNetworkingScripts(rootFs, nics); err != nil {
return err
}
ver := strings.Split(relInfo.Version, ".")
iv, err := strconv.ParseInt(ver[0], 10, 0)
if err != nil {
@@ -1024,6 +1028,14 @@ func (c *SFedoraRootFs) GetReleaseInfo(rootFs IDiskPartition) *SReleaseInfo {
return newReleaseInfo(c.GetName(), version, c.GetArch(rootFs))
}
func (c *SFedoraRootFs) DeployNetworkingScripts(rootFs IDiskPartition, nics []jsonutils.JSONObject) error {
relInfo := c.GetReleaseInfo(rootFs)
if err := c.sRedhatLikeRootFs.deployNetworkingScripts(rootFs, nics, relInfo); err != nil {
return err
}
return nil
}
type SRhelRootFs struct {
*sRedhatLikeRootFs
}
@@ -1052,6 +1064,14 @@ func (d *SRhelRootFs) GetReleaseInfo(rootFs IDiskPartition) *SReleaseInfo {
return newReleaseInfo(d.GetName(), version, d.GetArch(rootFs))
}
func (d *SRhelRootFs) DeployNetworkingScripts(rootFs IDiskPartition, nics []jsonutils.JSONObject) error {
relInfo := d.GetReleaseInfo(rootFs)
if err := d.sRedhatLikeRootFs.deployNetworkingScripts(rootFs, nics, relInfo); err != nil {
return err
}
return nil
}
type SGentooRootFs struct {
*sLinuxRootFs
}