Add network.topology into conf.ToMap()
Signed-off-by: Zhengyi Lai <zheng1@yunify.com>
This commit is contained in:
@@ -170,6 +170,7 @@ func (conf *Config) ToMap() map[string]bool {
|
||||
if name == "network" {
|
||||
ippoolName := "network.ippool"
|
||||
nsnpName := "network"
|
||||
networkTopologyName := "network.topology"
|
||||
if conf.NetworkOptions == nil {
|
||||
result[nsnpName] = false
|
||||
result[ippoolName] = false
|
||||
@@ -185,6 +186,12 @@ func (conf *Config) ToMap() map[string]bool {
|
||||
} else {
|
||||
result[ippoolName] = true
|
||||
}
|
||||
|
||||
if conf.NetworkOptions.WeaveScopeHost == "" {
|
||||
result[networkTopologyName] = false
|
||||
} else {
|
||||
result[networkTopologyName] = true
|
||||
}
|
||||
}
|
||||
continue
|
||||
}
|
||||
@@ -226,7 +233,7 @@ func (conf *Config) stripEmptyOptions() {
|
||||
conf.OpenPitrixOptions = nil
|
||||
}
|
||||
|
||||
if conf.NetworkOptions != nil && conf.NetworkOptions.EnableNetworkPolicy == false {
|
||||
if conf.NetworkOptions != nil && conf.NetworkOptions.IsEmpty() {
|
||||
conf.NetworkOptions = nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user