Skip to content

GitLab

Commit fe20880b authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files
Options

Changes for Gen9 geni rack wiring.

parent fac9c573
Hide whitespace changes
Inline Side-by-side
Showing with 381 additions and 2 deletions
install/genirack/mknewconfig.in
View file @ fe20880b
...@@ -103,6 +103,7 @@ foreach my $node ($wiringdoc->documentElement()->find("./wire")->get_nodelist()) ...@@ -103,6 +103,7 @@ foreach my $node ($wiringdoc->documentElement()->find("./wire")->get_nodelist())
'location' => $location, 'location' => $location,
'iface' => GetText('iface', $node), 'iface' => GetText('iface', $node),
'role' => GetText('role', $node), 'role' => GetText('role', $node),
'type' => GetText('interface_type', $node),
'card' => GetText('card1', $node), 'card' => GetText('card1', $node),
'port' => GetText('port1', $node), 'port' => GetText('port1', $node),
'switch' => GetText('node_id2', $node), 'switch' => GetText('node_id2', $node),
...@@ -149,7 +150,10 @@ foreach my $current (@wires) { ...@@ -149,7 +150,10 @@ foreach my $current (@wires) {
my $device = $devices{$location}; my $device = $devices{$location};
my $mac; my $mac;
my $role = $current->{'role'}; my $role = $current->{'role'};
my $type = "bce"; my $type = $current->{'type'};
if (!defined($type)) {
$type = "bce";
}
if ($role eq "mngmnt") { if ($role eq "mngmnt") {
$type = "ilo3"; $type = "ilo3";
$mac = $device->{'ilomac'}; $mac = $device->{'ilomac'};
......
install/genirack/tbdb.sql
View file @ fe20880b
...@@ -5,6 +5,13 @@ REPLACE INTO `interface_capabilities` ...@@ -5,6 +5,13 @@ REPLACE INTO `interface_capabilities`
REPLACE INTO `interface_capabilities` REPLACE INTO `interface_capabilities`
VALUES ('bce','ethernet_defspeed','1000000'); VALUES ('bce','ethernet_defspeed','1000000');
REPLACE INTO `interface_types`
VALUES ('bnx',10000000,1,'Broadcom','10G Ethernet',1,'RJ45');
REPLACE INTO `interface_capabilities`
VALUES ('bnx','protocols','ethernet');
REPLACE INTO `interface_capabilities`
VALUES ('bnx','ethernet_defspeed','10000000');
REPLACE INTO `interface_types` REPLACE INTO `interface_types`
VALUES ('igb',1000000,1,'Intel','Gigabit Ethernet',1,'RJ45'); VALUES ('igb',1000000,1,'Intel','Gigabit Ethernet',1,'RJ45');
REPLACE INTO `interface_capabilities` REPLACE INTO `interface_capabilities`
...@@ -37,6 +44,12 @@ replace into node_type_attributes set ...@@ -37,6 +44,12 @@ replace into node_type_attributes set
attrvalue='ethernet',attrtype='string'; attrvalue='ethernet',attrtype='string';
replace into nodes set replace into nodes set
node_id='procurve2',phys_nodeid='procurve2',type='hp5406',role='testswitch'; node_id='procurve2',phys_nodeid='procurve2',type='hp5406',role='testswitch';
replace into node_types set
class='switch', isswitch=1, type='hp5406r';
replace into node_type_attributes set
type='hp5406r',attrkey='forwarding_protocols',
attrvalue='ethernet',attrtype='string';
REPLACE INTO `switch_stack_types` REPLACE INTO `switch_stack_types`
VALUES ('Experiment','generic',0,0,NULL,257,999,'procurve2'); VALUES ('Experiment','generic',0,0,NULL,257,999,'procurve2');
......
install/genirack/wiring-Gen9.xml 0 → 100644
View file @ fe20880b
<wiring>
<wire>
<UXX>U05</UXX>
<interface_type>bce</interface_type>
<node_id1>pc1</node_id1>
<iface>eth0</iface>
<role>ctrl</role>
<card1>0</card1>
<port1>1</port1>
<node_id2>procurve1</node_id2>
<card2>1</card2>
<port2>1</port2>
</wire>
<wire>
<UXX>U05</UXX>
<interface_type>bce</interface_type>
<node_id1>pc1</node_id1>
<iface>eth1</iface>
<role>expt</role>
<card1>1</card1>
<port1>1</port1>
<node_id2>procurve2</node_id2>
<card2>1</card2>
<port2>1</port2>
</wire>
<wire>
<UXX>U05</UXX>
<interface_type>bce</interface_type>
<node_id1>pc1</node_id1>
<iface>eth2</iface>
<role>expt</role>
<card1>2</card1>
<port1>1</port1>
<node_id2>procurve2</node_id2>
<card2>1</card2>
<port2>2</port2>
</wire>
<wire>
<UXX>U05</UXX>
<interface_type>bce</interface_type>
<node_id1>pc1</node_id1>
<iface>eth3</iface>
<role>expt</role>
<card1>3</card1>
<port1>1</port1>
<node_id2>procurve2</node_id2>
<card2>1</card2>
<port2>3</port2>
</wire>
<wire>
<UXX>U05</UXX>
<interface_type>bnx</interface_type>
<node_id1>pc1</node_id1>
<iface>eth4</iface>
<role>expt</role>
<card1>4</card1>
<port1>1</port1>
<node_id2>procurve2</node_id2>
<card2>2</card2>
<port2>1</port2>
</wire>
<wire>
<UXX>U05</UXX>
<interface_type>bce</interface_type>
<node_id1>pc1</node_id1>
<iface>ilo3</iface>
<role>mngmnt</role>
<card1>99</card1>
<port1>1</port1>
<node_id2>procurve1</node_id2>
<card2>1</card2>
<port2>2</port2>
</wire>
<wire>
<UXX>U06</UXX>
<interface_type>bce</interface_type>
<node_id1>pc2</node_id1>
<iface>eth0</iface>
<role>ctrl</role>
<card1>0</card1>
<port1>1</port1>
<node_id2>procurve1</node_id2>
<card2>1</card2>
<port2>3</port2>
</wire>
<wire>
<UXX>U06</UXX>
<interface_type>bce</interface_type>
<node_id1>pc2</node_id1>
<iface>eth1</iface>
<role>expt</role>
<card1>1</card1>
<port1>1</port1>
<node_id2>procurve2</node_id2>
<card2>1</card2>
<port2>4</port2>
</wire>
<wire>
<UXX>U06</UXX>
<interface_type>bce</interface_type>
<node_id1>pc2</node_id1>
<iface>eth2</iface>
<role>expt</role>
<card1>2</card1>
<port1>1</port1>
<node_id2>procurve2</node_id2>
<card2>1</card2>
<port2>5</port2>
</wire>
<wire>
<UXX>U06</UXX>
<interface_type>bce</interface_type>
<node_id1>pc2</node_id1>
<iface>eth3</iface>
<role>expt</role>
<card1>3</card1>
<port1>1</port1>
<node_id2>procurve2</node_id2>
<card2>1</card2>
<port2>6</port2>
</wire>
<wire>
<UXX>U06</UXX>
<interface_type>bnx</interface_type>
<node_id1>pc2</node_id1>
<iface>eth4</iface>
<role>expt</role>
<card1>4</card1>
<port1>1</port1>
<node_id2>procurve2</node_id2>
<card2>2</card2>
<port2>2</port2>
</wire>
<wire>
<UXX>U06</UXX>
<interface_type>bce</interface_type>
<node_id1>pc2</node_id1>
<iface>ilo3</iface>
<role>mngmnt</role>
<card1>99</card1>
<port1>1</port1>
<node_id2>procurve1</node_id2>
<card2>1</card2>
<port2>4</port2>
</wire>
<wire>
<UXX>U07</UXX>
<interface_type>bce</interface_type>
<node_id1>pc3</node_id1>
<iface>eth0</iface>
<role>ctrl</role>
<card1>0</card1>
<port1>1</port1>
<node_id2>procurve1</node_id2>
<card2>1</card2>
<port2>6</port2>
</wire>
<wire>
<UXX>U07</UXX>
<interface_type>bce</interface_type>
<node_id1>pc3</node_id1>
<iface>eth1</iface>
<role>expt</role>
<card1>1</card1>
<port1>1</port1>
<node_id2>procurve2</node_id2>
<card2>1</card2>
<port2>7</port2>
</wire>
<wire>
<UXX>U07</UXX>
<interface_type>bce</interface_type>
<node_id1>pc3</node_id1>
<iface>eth2</iface>
<role>expt</role>
<card1>2</card1>
<port1>1</port1>
<node_id2>procurve2</node_id2>
<card2>1</card2>
<port2>8</port2>
</wire>
<wire>
<UXX>U07</UXX>
<interface_type>bce</interface_type>
<node_id1>pc3</node_id1>
<iface>eth3</iface>
<role>expt</role>
<card1>3</card1>
<port1>1</port1>
<node_id2>procurve2</node_id2>
<card2>1</card2>
<port2>9</port2>
</wire>
<wire>
<UXX>U07</UXX>
<interface_type>bnx</interface_type>
<node_id1>pc3</node_id1>
<iface>eth4</iface>
<role>expt</role>
<card1>4</card1>
<port1>1</port1>
<node_id2>procurve2</node_id2>
<card2>2</card2>
<port2>3</port2>
</wire>
<wire>
<UXX>U07</UXX>
<interface_type>bce</interface_type>
<node_id1>pc3</node_id1>
<iface>ilo3</iface>
<role>mngmnt</role>
<card1>99</card1>
<port1>1</port1>
<node_id2>procurve1</node_id2>
<card2>1</card2>
<port2>6</port2>
</wire>
<wire>
<UXX>U08</UXX>
<interface_type>bce</interface_type>
<node_id1>pc4</node_id1>
<iface>eth0</iface>
<role>ctrl</role>
<card1>0</card1>
<port1>1</port1>
<node_id2>procurve1</node_id2>
<card2>1</card2>
<port2>7</port2>
</wire>
<wire>
<UXX>U08</UXX>
<interface_type>bce</interface_type>
<node_id1>pc4</node_id1>
<iface>eth1</iface>
<role>expt</role>
<card1>1</card1>
<port1>1</port1>
<node_id2>procurve2</node_id2>
<card2>1</card2>
<port2>10</port2>
</wire>
<wire>
<UXX>U08</UXX>
<interface_type>bce</interface_type>
<node_id1>pc4</node_id1>
<iface>eth2</iface>
<role>expt</role>
<card1>2</card1>
<port1>1</port1>
<node_id2>procurve2</node_id2>
<card2>1</card2>
<port2>11</port2>
</wire>
<wire>
<UXX>U08</UXX>
<interface_type>bce</interface_type>
<node_id1>pc4</node_id1>
<iface>eth3</iface>
<role>expt</role>
<card1>3</card1>
<port1>1</port1>
<node_id2>procurve2</node_id2>
<card2>1</card2>
<port2>12</port2>
</wire>
<wire>
<UXX>U08</UXX>
<interface_type>bnx</interface_type>
<node_id1>pc4</node_id1>
<iface>eth4</iface>
<role>expt</role>
<card1>4</card1>
<port1>1</port1>
<node_id2>procurve2</node_id2>
<card2>2</card2>
<port2>4</port2>
</wire>
<wire>
<UXX>U08</UXX>
<interface_type>bce</interface_type>
<node_id1>pc4</node_id1>
<iface>ilo3</iface>
<role>mngmnt</role>
<card1>99</card1>
<port1>1</port1>
<node_id2>procurve1</node_id2>
<card2>1</card2>
<port2>8</port2>
</wire>
<wire>
<UXX>U09</UXX>
<interface_type>bce</interface_type>
<node_id1>pc5</node_id1>
<iface>eth0</iface>
<role>ctrl</role>
<card1>0</card1>
<port1>1</port1>
<node_id2>procurve1</node_id2>
<card2>1</card2>
<port2>9</port2>
</wire>
<wire>
<UXX>U09</UXX>
<interface_type>bce</interface_type>
<node_id1>pc5</node_id1>
<iface>eth1</iface>
<role>expt</role>
<card1>1</card1>
<port1>1</port1>
<node_id2>procurve2</node_id2>
<card2>1</card2>
<port2>13</port2>
</wire>
<wire>
<UXX>U09</UXX>
<interface_type>bce</interface_type>
<node_id1>pc5</node_id1>
<iface>eth2</iface>
<role>expt</role>
<card1>2</card1>
<port1>1</port1>
<node_id2>procurve2</node_id2>
<card2>1</card2>
<port2>14</port2>
</wire>
<wire>
<UXX>U09</UXX>
<interface_type>bce</interface_type>
<node_id1>pc5</node_id1>
<iface>eth3</iface>
<role>expt</role>
<card1>3</card1>
<port1>1</port1>
<node_id2>procurve2</node_id2>
<card2>1</card2>
<port2>15</port2>
</wire>
<wire>
<UXX>U09</UXX>
<interface_type>bnx</interface_type>
<node_id1>pc5</node_id1>
<iface>eth4</iface>
<role>expt</role>
<card1>4</card1>
<port1>1</port1>
<node_id2>procurve2</node_id2>
<card2>2</card2>
<port2>5</port2>
</wire>
<wire>
<UXX>U09</UXX>
<interface_type>bce</interface_type>
<node_id1>pc5</node_id1>
<iface>ilo3</iface>
<role>mngmnt</role>
<card1>99</card1>
<port1>1</port1>
<node_id2>procurve1</node_id2>
<card2>1</card2>
<port2>10</port2>
</wire>
</wiring>
install/phases/boss/genirack
View file @ fe20880b
...@@ -29,7 +29,7 @@ my $RACKVARS = "$PREFIX/etc/genirack/variables.txt"; ...@@ -29,7 +29,7 @@ my $RACKVARS = "$PREFIX/etc/genirack/variables.txt";
my $RACKIPS = "$PREFIX/etc/genirack/ips.txt"; my $RACKIPS = "$PREFIX/etc/genirack/ips.txt";
my $RACKILO = "$PREFIX/etc/genirack/ilo.xml"; my $RACKILO = "$PREFIX/etc/genirack/ilo.xml";
my $RACKWIRES = "$PREFIX/etc/genirack/wiring.xml"; my $RACKWIRES = "$PREFIX/etc/genirack/wiring.xml";
my $RACKWIRESDEF = "$TOP_SRCDIR/install/genirack/wiring-A.xml"; my $RACKWIRESDEF = "$TOP_SRCDIR/install/genirack/wiring-Gen9.xml";
my $ILOPASSWORD = "$PREFIX/etc/ilo.pswd"; my $ILOPASSWORD = "$PREFIX/etc/ilo.pswd";
my $ELABPASSWORD = "$PREFIX/etc/elabman.pswd"; my $ELABPASSWORD = "$PREFIX/etc/elabman.pswd";
my $HPPASSWORD = "$PREFIX/etc/switch.pswd"; my $HPPASSWORD = "$PREFIX/etc/switch.pswd";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment