Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MTL-1832 #423

Merged
merged 3 commits into from
Sep 20, 2024
Merged

MTL-1832 #423

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1d6c12
MTL-1832
jpdavis-prof Sep 18, 2024
0ab9007
move disks into separate file
jpdavis-prof Sep 20, 2024
e87c9de
add copyright
jpdavis-prof Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions pkg/cli/config/initialize/basecamp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ type BaseCampGlobals struct {
}

// Basecamp Defaults
// See disks.go for disk layout, filesystems, and mounts

// We should try to make these customizable by the user at some point
// k8sRunCMD has the list of scripts to run on NCN boot for
// all members of the kubernetes cluster
Expand Down Expand Up @@ -603,19 +605,28 @@ func MakeBaseCampfromNCNs(
ShastaRole: "ncn-" + strings.ToLower(ncn.Subrole),
IPAM: ncnIPAM,
}

userDataMap := make(map[string]interface{})
if ncn.Subrole == "Storage" {
if strings.HasSuffix(
ncn.Hostname,
"001",
) {
switch ncn.Subrole {
case "Storage":
userDataMap["bootcmd"] = cephBootCMD
userDataMap["fs_setup"] = cephFileSystems
userDataMap["mounts"] = cephMounts
if strings.HasSuffix(ncn.Hostname, "001") {
userDataMap["runcmd"] = cephRunCMD
} else {
userDataMap["runcmd"] = cephWorkerRunCMD
}
} else {
userDataMap["runcmd"] = k8sRunCMD
case "Master":
userDataMap["bootcmd"] = masterBootCMD
userDataMap["fs_setup"] = masterFileSystems
userDataMap["mounts"] = masterMounts
case "Worker":
userDataMap["bootcmd"] = workerBootCMD
userDataMap["fs_setup"] = workerFileSystems
userDataMap["mounts"] = workerMounts
}

userDataMap["hostname"] = ncn.Hostname
userDataMap["local_hostname"] = ncn.Hostname
userDataMap["mac0"] = mac0Interface
Expand Down
308 changes: 308 additions & 0 deletions pkg/cli/config/initialize/disks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,308 @@
package initialize
jpdavis-prof marked this conversation as resolved.
Show resolved Hide resolved

import "fmt"

const (
crays3cache = "CRAYS3CACHE"
conrun = "CONRUN"
conlib = "CONLIB"
k8slet = "K8SLET"
cephetc = "CEPHETC"
cephvar = "CEPHVAR"
contain = "CONTAIN"
volumeGroup = "metalvg0"
raidArray = "/dev/md/AUX"
)
jpdavis-prof marked this conversation as resolved.
Show resolved Hide resolved

// master bootcmd (cloud-init user-data)
var masterBootCMD = [][]string{
{
"cloud-init-per",
"once",
"create_PV",
"pvcreate",
"-ff",
"-y",
"-M",
"lvm2",
raidArray,
},
{
"cloud-init-per",
"once",
"create_VG",
"vgcreate",
volumeGroup,
raidArray,
},
{
"cloud-init-per",
"once",
fmt.Sprintf("create_LV_%s", crays3cache),
"lvcreate",
"-l",
"25%PVS",
"-n",
crays3cache,
"-y",
volumeGroup,
},
{
"cloud-init-per",
"once",
fmt.Sprintf("create_LV_%s", conrun),
"lvcreate",
"-l",
"4%PVS",
"-n",
conrun,
"-y",
volumeGroup,
},
{
"cloud-init-per",
"once",
fmt.Sprintf("create_LV_%s", conlib),
"lvcreate",
"-l",
"36%PVS",
"-n",
conlib,
"-y",
volumeGroup,
},
{
"cloud-init-per",
"once",
fmt.Sprintf("create_LV_%s", k8slet),
"lvcreate",
"-l",
"10%PVS",
"-n",
k8slet,
"-y",
volumeGroup,
},
}

// master fs_setup (cloud-init user-data)
var masterFileSystems = []map[string]interface{}{
{
"label": crays3cache,
"filesystem": "ext4",
"device": fmt.Sprintf("/dev/disk/by-id/dm-name-%s-%s", volumeGroup, crays3cache),
"partition": "auto",
"overwrite": true,
},
{
"label": conrun,
"filesystem": "xfs",
"device": fmt.Sprintf("/dev/disk/by-id/dm-name-%s-%s", volumeGroup, conrun),
"partition": "auto",
"overwrite": true,
},
{
"label": conlib,
"filesystem": "xfs",
"device": fmt.Sprintf("/dev/disk/by-id/dm-name-%s-%s", volumeGroup, conlib),
"partition": "auto",
"overwrite": true,
},
{
"label": k8slet,
"filesystem": "xfs",
"device": fmt.Sprintf("/dev/disk/by-id/dm-name-%s-%s", volumeGroup, k8slet),
"partition": "auto",
"overwrite": true,
},
}

// master mounts (cloud-init user-data)
var masterMounts = [][]string{
{
fmt.Sprintf("LABEL=%s", crays3cache),
"/var/lib/s3fs_cache",
"ext4",
"defaults,nofail",
},
{
fmt.Sprintf("LABEL=%s", conrun),
"/run/containerd",
"xfs",
"defaults,nofail",
},
{
fmt.Sprintf("LABEL=%s", conlib),
"/var/lib/containerd",
"xfs",
"defaults,nofail",
},
{
fmt.Sprintf("LABEL=%s", k8slet),
"/var/lib/kubelet",
"xfs",
"defaults,nofail",
},
}

// worker bootcmd (cloud-init user-data)
var workerBootCMD = [][]string{
{
"cloud-init-per",
"once",
"create_PV",
"pvcreate",
"-ff",
"-y",
"-M",
"lvm2",
raidArray,
},
{
"cloud-init-per",
"once",
"create_VG",
"vgcreate",
volumeGroup,
raidArray,
},
{
"cloud-init-per",
"once",
fmt.Sprintf("create_LV_%s", crays3cache),
"lvcreate",
"-L",
"200GB",
"-n",
crays3cache,
"-y",
volumeGroup,
},
}

// worker fs_setup (cloud-init user-data)
var workerFileSystems = []map[string]interface{}{
{
"label": crays3cache,
"filesystem": "ext4",
"device": fmt.Sprintf("/dev/disk/by-id/dm-name-%s-%s", volumeGroup, crays3cache),
"partition": "auto",
"overwrite": true,
},
}

// worker mounts (cloud-init user-data)
var workerMounts = [][]string{
{
fmt.Sprintf("LABEL=%s", crays3cache),
"/var/lib/s3fs_cache",
"ext4",
"defaults,nofail",
},
}

// storage bootcmd (cloud-init user-data)
var cephBootCMD = [][]string{
{
"cloud-init-per",
"once",
"create_PV",
"pvcreate",
"-ff",
"-y",
"-M",
"lvm2",
raidArray,
},
{
"cloud-init-per",
"once",
"create_VG",
"vgcreate",
volumeGroup,
raidArray,
},
{
"cloud-init-per",
"once",
fmt.Sprintf("create_LV_%s", cephetc),
"lvcreate",
"-L",
"10GB",
"-n",
cephetc,
"-y",
volumeGroup,
},
{
"cloud-init-per",
"once",
fmt.Sprintf("create_LV_%s", cephvar),
"lvcreate",
"-L",
"60GB",
"-n",
cephvar,
"-y",
volumeGroup,
},
{
"cloud-init-per",
"once",
fmt.Sprintf("create_LV_%s", contain),
"lvcreate",
"-L",
"60GB",
"-n",
contain,
"-y",
volumeGroup,
},
}

// storage fs_setup (cloud-init user-data)
var cephFileSystems = []map[string]interface{}{
{
"label": cephetc,
"filesystem": "ext4",
"device": fmt.Sprintf("/dev/disk/by-id/dm-name-%s-%s", volumeGroup, cephetc),
"partition": "auto",
"overwrite": true,
},
{
"label": cephvar,
"filesystem": "ext4",
"device": fmt.Sprintf("/dev/disk/by-id/dm-name-%s-%s", volumeGroup, cephvar),
"partition": "auto",
"overwrite": true,
},
{
"label": contain,
"filesystem": "xfs",
"device": fmt.Sprintf("/dev/disk/by-id/dm-name-%s-%s", volumeGroup, contain),
"partition": "auto",
"overwrite": true,
},
}

// storage mounts (cloud-init user-data)
var cephMounts = [][]string{
{
fmt.Sprintf("LABEL=%s", cephetc),
"/etc/ceph",
"auto",
"defaults",
},
{
fmt.Sprintf("LABEL=%s", cephvar),
"/var/lib/ceph",
"auto",
"defaults",
},
{
fmt.Sprintf("LABEL=%s", contain),
"/var/lib/containers",
"auto",
"defaults",
},
}