From 02919ea0808d12ce6d378852c31138a27ddb80ad Mon Sep 17 00:00:00 2001 From: ertaozh Date: Fri, 11 Sep 2015 04:02:07 -0400 Subject: [PATCH] update title format, node and BMC/FSP ip address format --- .../ppc64le/discovery/config_environment.rst | 34 +++++++++---------- .../ppc64le/discovery/manually_define.rst | 8 ++--- .../ppc64le/discovery/manually_discovery.rst | 2 +- .../ppc64le/discovery/mtms_discovery.rst | 23 +++++++------ .../ppc64le/discovery/pbmc_discovery.rst | 14 ++++---- .../discovery/schedule_environment.rst | 14 ++++---- .../ppc64le/discovery/seq_discovery.rst | 8 ++--- .../discovery/standard_cn_definition.rst | 4 +-- .../ppc64le/discovery/switch_discovery.rst | 28 +++++++-------- 9 files changed, 68 insertions(+), 67 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/config_environment.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/config_environment.rst index 6e2e6d43c..ccf99323f 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/config_environment.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/config_environment.rst @@ -2,22 +2,22 @@ Configure xCAT -------------- configure network table -^^^^^^^^^^^^^^^^^^^^^^^ +``````````````````````` Normally, there will be at least two entries for the two subnet on MN in "networks" table after xCAT is installed:: #tabdump networks #netname,net,mask,mgtifname,gateway,dhcpserver,tftpserver,nameservers,ntpservers,logservers,dynamicrange,staticrange,staticrangeincrement,nodehostname,ddnsdomain,vlanid,domain,comments,disable - "10_1_0_0-255_255_0_0","10.1.0.0","255.255.0.0","eth1","",,"10.1.1.1",,,,,,,,,,,, - "10_2_0_0-255_255_0_0","10.2.0.0","255.255.0.0","eth2","",,"10.2.1.1",,,,,,,,,,,, + "10_0_0_0-255_255_0_0","10.0.0.0","255.255.0.0","eth1","",,"10.0.1.1",,,,,,,,,,,, + "50_0_0_0-255_255_0_0","50.0.0.0","255.255.0.0","eth2","",,"50.0.1.1",,,,,,,,,,,, Pls run the following command to add networks in "networks" table if no entry in "networks" table:: #makenetworks setup DHCP -^^^^^^^^^^ +`````````` Set the correct NIC from which DHCP server provide service:: @@ -25,8 +25,8 @@ Set the correct NIC from which DHCP server provide service:: Add dynamic range in purpose of assigning temporary IP adddress for FSP/BMCs and hosts:: -#chdef -t network 10_1_0_0-255_255_0_0 dynamicrange="10.1.100.1-10.1.100.100" -#chdef -t network 10_2_0_0-255_255_0_0 dynamicrange="10.2.100.1-10.2.100.100" +#chdef -t network 10_0_0_0-255_255_0_0 dynamicrange="10.0.100.1-10.0.100.100" +#chdef -t network 50_0_0_0-255_255_0_0 dynamicrange="50.0.100.1-50.0.100.100" Update DHCP configuration file:: @@ -34,7 +34,7 @@ Update DHCP configuration file:: #makedhcp -a setup DNS -^^^^^^^^^ +````````` Set site.forwarders to your site-wide DNS servers that can resolve site or public hostnames. The DNS on the MN will forward any requests it can't answer to these servers:: @@ -45,7 +45,7 @@ Run makedns to get the hostname/IP pairs copied from /etc/hosts to the DNS on th #makedns -n Config passwd table -^^^^^^^^^^^^^^^^^^^ +``````````````````` To configure default password for FSP/BMCs and Hosts:: @@ -55,21 +55,21 @@ To configure default password for FSP/BMCs and Hosts:: "ipmi","ADMIN","admin",,,, Check the genesis pkg -^^^^^^^^^^^^^^^^^^^^^ +````````````````````` Genesis pkg can be used to creates a network boot root image, it must be installed before do hardware discovery. -``RH``:: +* **[RH]**:: - # rpm -qa |grep -i genesis - xCAT-genesis-scripts-ppc64-2.10-snap201507240527.noarch - xCAT-genesis-base-ppc64-2.10-snap201505172314.noarch + # rpm -qa |grep -i genesis + xCAT-genesis-scripts-ppc64-2.10-snap201507240527.noarch + xCAT-genesis-base-ppc64-2.10-snap201505172314.noarch -``ubuntu``:: +* **[ubuntu]**:: - # dpkg -l | grep genesis - ii xcat-genesis-base-ppc64 2.10-snap201505172314 all xCAT Genesis netboot image - ii xcat-genesis-scripts 2.10-snap201507240105 ppc64el xCAT genesis + # dpkg -l | grep genesis + ii xcat-genesis-base-ppc64 2.10-snap201505172314 all xCAT Genesis netboot image + ii xcat-genesis-scripts 2.10-snap201507240105 ppc64el xCAT genesis **Note:** If the two pkgs haven't installed yet, pls installed them first and then run the following command to create the network boot root image:: diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_define.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_define.rst index e89d1b036..df2a89580 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_define.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_define.rst @@ -13,21 +13,21 @@ To add a node object:: To change node attributes:: - #chdef cn1 mgt=ipmi cons=ipmi ip=10.1.101.1 netboot=petitboot - #chdef cn1 bmc=10.2.101.1 bmcusername=ADMIN bmcpassword=admin + #chdef cn1 mgt=ipmi cons=ipmi ip=10.0.101.1 netboot=petitboot + #chdef cn1 bmc=50.0.101.1 bmcusername=ADMIN bmcpassword=admin #chdef cn1 installnic=mac primarynic=mac mac=6c:ae:8b:6a:d4:e4 The manually defined node will be like this:: # lsdef cn1 Object name: cn1 - bmc=10.2.101.1 + bmc=50.0.101.1 bmcpassword=admin bmcusername=ADMIN cons=ipmi groups=pkvm,all installnic=mac - ip=10.1.101.1 + ip=10.0.101.1 mac=6c:ae:8b:6a:d4:e4 mgt=ipmi netboot=petitboot diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_discovery.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_discovery.rst index a5e7207a7..025473d7d 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_discovery.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_discovery.rst @@ -13,7 +13,7 @@ If you want to manually define an 'undefined' node to a specific free node name, Before doing that, a node with desired IP address for hsot and FSP/BMC shall be defined first:: #nodeadd cn1 groups=pkvm,all - #chdef cn1 mgt=ipmi cons=ipmi ip=10.1.101.1 bmc=10.2.101.1 netboot=petitboot installnic=mac primarynic=mac + #chdef cn1 mgt=ipmi cons=ipmi ip=10.0.101.1 bmc=50.0.101.1 netboot=petitboot installnic=mac primarynic=mac For example, if you want to assign the undefined node whose uuid is 'fa2cec8a-b724-4840-82c7-3313811788cd' to cn1, run:: diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms_discovery.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms_discovery.rst index 2c2ab2637..1af52de02 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms_discovery.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms_discovery.rst @@ -12,20 +12,20 @@ After environment is ready, and the server is powered, we can start server disco The following command can be used to discovery FSP/BMC within an IP range and write the discovered node definition into a stanza file:: -# lsslp -s PBMC -u --range 10.2.100.1-100 -z > ./pbmc.stanza +# lsslp -s PBMC -u --range 50.0.100.1-100 -z > ./pbmc.stanza You need to modify the node definition in stanza file before using them, the stanza file will be like this:: # cat pbmc.stanza cn1: - objtype=node - bmc=10.2.100.1 - nodetype=mp - mtm=8247-42L - serial=10112CA - groups=pbmc,all - mgt=ipmi - hidden=0 + objtype=node + bmc=50.0.100.1 + nodetype=mp + mtm=8247-42L + serial=10112CA + groups=pbmc,all + mgt=ipmi + hidden=0 Then, define it into xCATdb:: @@ -36,7 +36,7 @@ The server definition will be like this:: # lsdef cn1 Object name: cn1 - bmc=10.2.100.1 + bmc=50.0.100.1 groups=pbmc,all hidden=0 mgt=ipmi @@ -48,7 +48,7 @@ The server definition will be like this:: After the physical server is defined into xCATdb, the next thing is update the node definition with the scheduled node info like this:: - # chdef cn1 ip=10.1.101.1 cons=ipmi + # chdef cn1 ip=10.0.101.1 1 object definitions have been created or modified. Then, add node info into /etc/hosts and DNS:: @@ -65,6 +65,7 @@ To start discovery process, just need to power on the host remotely with the fol **[Optional]** If you'd like to monitor the discovery process, you can use:: + #chdef cn1 cons=ipmi #makeconsercf #rcons cn1 diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery.rst index 48dcd52a6..2e3df1fd3 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery.rst @@ -5,13 +5,13 @@ After environment is ready, and the server is powered, we can start server disco The following command can be used to discovery FSP/BMC within an IP range and write the discovered node definition into xCAT database:: -# lsslp -s PBMC -u --range 10.2.100.1-100 -w +# lsslp -s PBMC -u --range 50.0.100.1-100 -w The discovered PBMC node will be like this:: - # lsdef Server-8247-22L-SN01112CA - Object name: Server-8247-22L-SN01112CA - bmc=10.2.100.1 + # lsdef Server-8247-22L-SN10112CA + Object name: Server-8247-22L-SN10112CA + bmc=50.0.100.1 groups=pbmc,all hidden=0 hwtype=pbmc @@ -29,11 +29,11 @@ Start discovery process To start discovery process, just need to power on the PBMC node remotely with the following command, and the discovery process will start automatically after the host is powered on:: -#rpower Server-8247-22L-SN01112CA on +#rpower Server-8247-22L-SN10112CA on **[Optional]** If you'd like to monitor the discovery process, you can use:: - #chdef Server-8247-22L-SN01112CA cons=ipmi + #chdef Server-8247-22L-SN10112CA cons=ipmi #makeconsercf - #rcons Server-8247-22L-SN01112CA + #rcons Server-8247-22L-SN10112CA diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/schedule_environment.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/schedule_environment.rst index a2f5497f1..186313f82 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/schedule_environment.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/schedule_environment.rst @@ -6,19 +6,19 @@ In this document, we use the following configuration as the example MN info:: MN Hostname: xcat1 - MN NIC info for Host network: eth1, 10.1.1.1/16 - MN NIC info for FSP/BMC network: eth2, 10.2.1.1/16 - Dynamic IP range for Hosts: 10.1.100.1-10.1.100.100 - Dynamic IP range for FSP/BMC: 10.2.100.1-10.2.100.100 + MN NIC info for Host network: eth1, 10.0.1.1/16 + MN NIC info for FSP/BMC network: eth2, 50.0.1.1/16 + Dynamic IP range for Hosts: 10.0.100.1-10.0.100.100 + Dynamic IP range for FSP/BMC: 50.0.100.1-50.0.100.100 CN info:: CN Hostname: cn1 Machine type/model: 8247-22L Serial: 10112CA - Host IP Address: 10.1.101.1 + Host IP Address: 10.0.101.1 Host Root Password: cluster - Desired FSP/BMC IP Address: 10.2.101.1 - DHCP assigned FSP/BMC IP Address: 10.2.100.1 + Desired FSP/BMC IP Address: 50.0.101.1 + DHCP assigned FSP/BMC IP Address: 50.0.100.1 FSP/BMC username: ADMIN FSP/BMC Password: admin diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst index 988d3182b..ebeb29fbc 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst @@ -11,15 +11,15 @@ Prepare node pool To prepare the node pool, shall predefine nodes first, then initialize the discovery process with the predefined nodes. Predefine nodes -^^^^^^^^^^^^^^^ +``````````````` Predefine a group of node with desired IP address for host and IP address for FSP/BMC:: #nodeadd cn1 groups=pkvm,all - #chdef cn1 mgt=ipmi cons=ipmi ip=10.1.101.1 bmc=10.2.101.1 netboot=petitboot installnic=mac primarynic=mac + #chdef cn1 mgt=ipmi cons=ipmi ip=10.0.101.1 bmc=50.0.101.1 netboot=petitboot installnic=mac primarynic=mac Initialize the discovery process -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +```````````````````````````````` Specify the predefined nodes to the nodediscoverstart command to initialize the discovery process:: @@ -28,7 +28,7 @@ Specify the predefined nodes to the nodediscoverstart command to initialize the Pls see "nodediscoverstart man page" for more details. Display information about the discovery process -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +``````````````````````````````````````````````` There are additional nodediscover commands you can run during the discovery process. See their man pages for more details. diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/standard_cn_definition.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/standard_cn_definition.rst index 365285d36..1329b1e36 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/standard_cn_definition.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/standard_cn_definition.rst @@ -6,13 +6,13 @@ The server node definition will be like this after hardware discovery process:: #lsdef cn1 Object name: cn1 arch=ppc64 - bmc=10.2.100.1 + bmc=50.0.100.1 cons=ipmi cpucount=192 cputype=POWER8E (raw), altivec supported groups=pkvm,all installnic=mac - ip=10.1.101.1 + ip=10.0.101.1 mac=6c:ae:8b:02:12:50 memory=65118MB mgt=ipmi diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst index a7a4f21f7..889467e99 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst @@ -10,27 +10,27 @@ In this document, we use the following configuration as the example MN info:: MN Hostname: xcat1 - MN NIC info for Host network: eth1, 10.1.1.1/16 - MN NIC info for FSP/BMC network: eth2, 10.2.1.1/16 - Dynamic IP range for Hosts: 10.1.100.1-10.1.100.100 - Dynamic IP range for FSP/BMC: 10.2.100.1-10.2.100.100 + MN NIC info for Host network: eth1, 10.0.1.1/16 + MN NIC info for FSP/BMC network: eth2, 50.0.1.1/16 + Dynamic IP range for Hosts: 10.0.100.1-10.0.100.100 + Dynamic IP range for FSP/BMC: 50.0.100.1-50.0.100.100 Switch info:: Switch name: switch1 Switch username: xcat Switch password: passw0rd - Switch IP Address: 10.1.201.1 + Switch IP Address: 10.0.201.1 CN info:: CN Hostname: cn1 Machine type/model: 8247-22L Serial: 10112CA - Host IP Address: 10.1.101.1 + Host IP Address: 10.0.101.1 Host Root Password: cluster - Desired FSP/BMC IP Address: 10.2.101.1 - DHCP assigned FSP/BMC IP Address: 10.2.100.1 + Desired FSP/BMC IP Address: 50.0.101.1 + DHCP assigned FSP/BMC IP Address: 50.0.100.1 FSP/BMC username: ADMIN FSP/BMC Password: admin Switch info: switch1, port0 @@ -43,7 +43,7 @@ Predefine Nodes In order to differentiate a node from the other, the admin need to predefine node in xCAT database based on the switches information. So, 2 parts included. Predefine Switches -^^^^^^^^^^^^^^^^^^ +`````````````````` The predefined switches will represent devices that the physical servers are connected to. xCAT need to access those switches to get server related information through SNMP v3. @@ -52,7 +52,7 @@ So the admin need to make sure those switches are configured correctly with SNMP Then, define switch info into xCAT:: #nodeadd switch1 groups=switch,all - #chdef switch1 ip=10.1.201.1 + #chdef switch1 ip=10.0.201.1 #tabch switch=switch1 switches.snmpversion=3 switches.username=xcat switches.password=passw0rd switches.auth=sha After that, add switch into DNS:: @@ -61,12 +61,12 @@ After that, add switch into DNS:: #makedns -n Predefine Server node -^^^^^^^^^^^^^^^^^^^^^ +````````````````````` After switches are defined, the server node can be predefined as network scheduled:: #nodeadd cn1 groups=pkvm,all - #chdef cn1 mgt=ipmi cons=ipmi ip=10.1.101.1 bmc=10.2.101.1 netboot=petitboot installnic=mac primarynic=mac + #chdef cn1 mgt=ipmi cons=ipmi ip=10.0.101.1 bmc=50.0.101.1 netboot=petitboot installnic=mac primarynic=mac #chdef cn1 switch=switch1 switchport=0 Add cn1 into DNS:: @@ -84,13 +84,13 @@ The server node definition will be like this after hardware discovery process:: #lsdef cn1 Object name: cn1 arch=ppc64 - bmc=10.2.101.1 + bmc=50.0.101.1 cons=ipmi cpucount=192 cputype=POWER8E (raw), altivec supported groups=pkvm,all installnic=mac - ip=10.1.101.1 + ip=10.0.101.1 mac=6c:ae:8b:02:12:50 memory=65118MB mgt=ipmi