adding netname option back
This commit is contained in:
@@ -13,16 +13,15 @@ import (
|
||||
)
|
||||
|
||||
func CobraRunE(cmd *cobra.Command, args []string) (err error) {
|
||||
// OptionStrMap, netWithoutName := apinode.AddNetname(OptionStrMap)
|
||||
// if netWithoutName {
|
||||
// return errors.New("a netname must be given for any network related configuration")
|
||||
// }
|
||||
// realMap := make(map[string]string)
|
||||
// remove the default network as the all network values are assigned
|
||||
// to this network
|
||||
if NetName != "" {
|
||||
netDev := *NodeConf.NetDevs["default"]
|
||||
NodeConf.NetDevs[NetName] = &netDev
|
||||
delete(NodeConf.NetDevs, "default")
|
||||
|
||||
// for key, val := range OptionStrMap {
|
||||
// realMap[key] = *val
|
||||
// }
|
||||
buffer, err := yaml.Marshal(nodeConf)
|
||||
}
|
||||
buffer, err := yaml.Marshal(NodeConf)
|
||||
if err != nil {
|
||||
wwlog.Error("Cant marshall nodeInfo", err)
|
||||
os.Exit(1)
|
||||
|
||||
@@ -33,16 +33,18 @@ var (
|
||||
},
|
||||
}
|
||||
SetNetDevDel string
|
||||
NetName string
|
||||
SetNodeAll bool
|
||||
SetYes bool
|
||||
SetForce bool
|
||||
nodeConf node.NodeConf
|
||||
NodeConf node.NodeConf
|
||||
)
|
||||
|
||||
func init() {
|
||||
nodeConf := node.NewConf()
|
||||
nodeConf.CreateFlags(baseCmd, []string{})
|
||||
NodeConf = node.NewConf()
|
||||
NodeConf.CreateFlags(baseCmd, []string{})
|
||||
baseCmd.PersistentFlags().StringVarP(&SetNetDevDel, "netdel", "D", "", "Delete the node's network device")
|
||||
baseCmd.PersistentFlags().StringVar(&NetName, "netname", "", "Set network name for network options")
|
||||
baseCmd.PersistentFlags().BoolVarP(&SetNodeAll, "all", "a", false, "Set all nodes")
|
||||
baseCmd.PersistentFlags().BoolVarP(&SetYes, "yes", "y", false, "Set 'yes' to all questions asked")
|
||||
baseCmd.PersistentFlags().BoolVarP(&SetForce, "force", "f", false, "Force configuration (even on error)")
|
||||
|
||||
Reference in New Issue
Block a user