From 159942dc9b10a7d93b5bd233ccc4ed0150c1363f Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Mon, 21 Oct 2019 16:48:44 -0400 Subject: [PATCH] Make bmcuser, bmcpassword and mac optional, but ip mandatory in template --- xCAT/templates/objects/node/ppc64le-ipmi.stanza | 6 +++--- xCAT/templates/objects/node/ppc64le-openbmc.stanza | 6 +++--- xCAT/templates/objects/node/ppc64lekvmguest.stanza | 2 +- xCAT/templates/objects/node/x86_64.stanza | 6 +++--- xCAT/templates/objects/node/x86_64kvmguest.stanza | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/xCAT/templates/objects/node/ppc64le-ipmi.stanza b/xCAT/templates/objects/node/ppc64le-ipmi.stanza index 706e6edf6..476b45dd8 100644 --- a/xCAT/templates/objects/node/ppc64le-ipmi.stanza +++ b/xCAT/templates/objects/node/ppc64le-ipmi.stanza @@ -4,12 +4,12 @@ ppc64le-template: objtype=node arch=ppc64le bmc="MANDATORY:The hostname or ip address of the BMC adapater" - bmcpassword="MANDATORY:the password of the BMC" - bmcusername="MANDATORY:the username of the BMC" + bmcpassword="OPTIONAL:the password of the BMC" + bmcusername="OPTIONAL:the username of the BMC" cons=ipmi groups=all ip="MANDATORY:the ip address of the node" - mac="MANDATORY:the mac of the node" + mac="OPTIONAL:the mac of the node" mgt=ipmi netboot=petitboot nodetype=mp diff --git a/xCAT/templates/objects/node/ppc64le-openbmc.stanza b/xCAT/templates/objects/node/ppc64le-openbmc.stanza index e4418f9a1..927331c0c 100644 --- a/xCAT/templates/objects/node/ppc64le-openbmc.stanza +++ b/xCAT/templates/objects/node/ppc64le-openbmc.stanza @@ -4,12 +4,12 @@ ppc64le-openbmc-template: objtype=node arch=ppc64le bmc="MANDATORY:The hostname or ip address of the BMC adapater" - bmcpassword="MANDATORY:the password of the BMC" - bmcusername="MANDATORY:the username of the BMC" + bmcpassword="OPTIONAL:the password of the BMC" + bmcusername="OPTIONAL:the username of the BMC" cons=openbmc groups=all ip="MANDATORY:the ip address of the node" - mac="MANDATORY:the mac of the node" + mac="OPTIONAL:the mac of the node" mgt=openbmc netboot=petitboot nodetype=mp diff --git a/xCAT/templates/objects/node/ppc64lekvmguest.stanza b/xCAT/templates/objects/node/ppc64lekvmguest.stanza index afa31e27e..2610d38b3 100644 --- a/xCAT/templates/objects/node/ppc64lekvmguest.stanza +++ b/xCAT/templates/objects/node/ppc64lekvmguest.stanza @@ -5,7 +5,7 @@ ppc64lekvmguest-template: arch=ppc64le groups=all ip="MANDATORY:the ip address of the kvm guest" - mac="MANDATORY:the mac of the kvm guest" + mac="OPTIONAL:the mac of the kvm guest" mgt=kvm netboot=grub2 vmcpus=2 diff --git a/xCAT/templates/objects/node/x86_64.stanza b/xCAT/templates/objects/node/x86_64.stanza index a2ad508d8..085ccc17e 100644 --- a/xCAT/templates/objects/node/x86_64.stanza +++ b/xCAT/templates/objects/node/x86_64.stanza @@ -4,14 +4,14 @@ x86_64-template: objtype=node arch=x86_64 bmc="MANDATORY:The hostname or ip address of the BMC adapater" - bmcpassword="MANDATORY:the password of the BMC" - bmcusername="MANDATORY:the username of the BMC" + bmcpassword="OPTIONAL:the password of the BMC" + bmcusername="OPTIONAL:the username of the BMC" cons=ipmi getmac=ipmi groups=all hcp= ip="MANDATORY:the ip address of the node" - mac="MANDATORY:the mac of the node" + mac="OPTIONAL:the mac of the node" mgt=ipmi netboot=xnba serialport=0 diff --git a/xCAT/templates/objects/node/x86_64kvmguest.stanza b/xCAT/templates/objects/node/x86_64kvmguest.stanza index 5b2329477..16494de27 100644 --- a/xCAT/templates/objects/node/x86_64kvmguest.stanza +++ b/xCAT/templates/objects/node/x86_64kvmguest.stanza @@ -5,7 +5,7 @@ x86_64kvmguest-template: arch=x86_64 groups=all ip="MANDATORY:the ip address of the kvm guest" - mac="MANDATORY:the mac of the kvm guest" + mac="OPTIONAL:the mac of the kvm guest" mgt=kvm netboot=xnba serialport=0