From b002862ee8df397eb75441af615230ee711e1282 Mon Sep 17 00:00:00 2001 From: polsevev Date: Thu, 17 Oct 2024 20:51:10 +0200 Subject: [PATCH] Fabrikken VM + New hypervisor host Hyperion --- ansible/bootstrap.yml | 6 +- ansible/homelab.ini | 4 + ansible/roles/enigmatica2/files/settings.cfg | 2 +- ansible/roles/grafana/vars/main/vault.yml | 134 ++++++++++--------- terraform/fabrikken.tf | 45 +++++++ terraform/matmonster.tf | 6 +- 6 files changed, 124 insertions(+), 73 deletions(-) create mode 100644 terraform/fabrikken.tf diff --git a/ansible/bootstrap.yml b/ansible/bootstrap.yml index d81ee4e..e8a2f8e 100644 --- a/ansible/bootstrap.yml +++ b/ansible/bootstrap.yml @@ -1,8 +1,6 @@ --- - name: Setup uptime_kuma hosts: - - matmonster + - grafana roles: - - upgrade - - common - - enigmatica2 + - grafana \ No newline at end of file diff --git a/ansible/homelab.ini b/ansible/homelab.ini index 566eec7..157d4ea 100644 --- a/ansible/homelab.ini +++ b/ansible/homelab.ini @@ -23,6 +23,9 @@ ansible_user=ansible [zeus] 192.168.1.20 cloudinit_id=9000 +[hyperion] +192.168.1.102 + [proxmox] [proxmox:children] @@ -32,6 +35,7 @@ hades hermes oceanus poseidon +hyperion [polsevev] 192.168.1.92 diff --git a/ansible/roles/enigmatica2/files/settings.cfg b/ansible/roles/enigmatica2/files/settings.cfg index 8b01330..212952a 100644 --- a/ansible/roles/enigmatica2/files/settings.cfg +++ b/ansible/roles/enigmatica2/files/settings.cfg @@ -2,7 +2,7 @@ ;See "serverstart.log" in the LOGS subfolder ;For more details/help see: https://github.com/AllTheMods/Server-Scripts -MAX_RAM=7G; +MAX_RAM=6G; JAVA_ARGS=-XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=https://mcflags.emc.gs -Daikars.new.flags=true -Dfml.readTimeout=180 -Dfml.queryResult=confirm; CRASH_COUNT=5; CRASH_TIMER=600; diff --git a/ansible/roles/grafana/vars/main/vault.yml b/ansible/roles/grafana/vars/main/vault.yml index ad5eab6..725d010 100644 --- a/ansible/roles/grafana/vars/main/vault.yml +++ b/ansible/roles/grafana/vars/main/vault.yml @@ -1,66 +1,70 @@ $ANSIBLE_VAULT;1.1;AES256 -32666131343332363135323733373566353230316436313265616363626336623638333237363638 -3863326562646162303132363439326633353063303632610a356531613039613433623837333830 -38353035653435663364653763366364303839376336353239316666356134393835313538646333 -3735626262613933310a633833616337366539646561646630636364373936663734653539626131 -38376637333030383161616366303062666164326265393834633962343636363333313964343634 -34616361373865656565313862356165653163623962636135616435636563626162643963346532 -35663363623963656537323764666238646363373338316662653937346131323936613061626463 -65363235643339373936313964643461666466663733653364326433396535656231366333616561 -38306437353065663563316336663430383264386231393363613539303365346438353036633361 -66643065313733613733363534323739656562346534346635323636373766346162336235353831 -61636335363262616365366465323966656666313038333630343539396436303966386435643564 -34633838623736623062356138363738613064313265613030333037663934336365323538386564 -33643938376463623661316330386434306264313463336365333232633333383139343637343731 -30636632626430663965653239363463323363623333623532333337353535356531663433326336 -31373262643431323737636231633137373734313661613737666365616433306465373766373565 -39373065343339623434316532316438393538366330663731343139306239353239653735636263 -34336466333464373865663136666137333637373163396630303762663633666166316136373537 -37656564613266333366383333373434366536343739303637613532386134316436636264383435 -39316262303530383933346232663436363661333432353238363162623762353631643632326436 -31636533326366356461326162663631333234326365626430386535326261303563623138396365 -30396338616334323438383038303037363736636537613236396539373838343861336233383262 -63646662363834636538333938356338376431636331626566366237616564376337613931666535 -39313539656630333536633961616237373661646261366166626635373332663036623163633964 -37353465636534653762323436633430613332653134323332643231303365303061336433633163 -38316335313534383030326430363734383837656134386664663061383262323631613163633165 -35396465383636663664363839386133363937373737333230313264666464383331363463303664 -66393965653535393639306539623337666539303033323337616436393039316434393238326364 -62373165633636313761636463316230646530383564343438363337323831396163313965646135 -30386332613030643038623438636632623562343038633763316165356336663663626238653430 -36373838663864396566656466646538323832653262356238666333613862626261316137356634 -66353565333963663961666236386532626462646637343633393937386466336163303934376636 -30616530306239396337656332636135623061353962633935613131303261343037643063306638 -30356462313330383636323931386639323338316630363236353464323561383833316464353066 -61346665366661623132336434373666323735316261306365663333346533383065613966646161 -64343135653064343136363063373663373566616363346131333139343733633534326139623535 -38373037623732386438373862353163666462303838336138303036336263373636366665343830 -64323338373663303731323832386537396661323862316262383334613366393738306539346531 -31343230633161356539386563366434393365643431386331346136353736303334616434613737 -61313932323337626430636262393563313135613661356132343165653834316337383064333162 -30343363646137376237383034383264343632316538626532353137666536613436386634373131 -37376463313735373863663637636362306438633533353262643061623834313964393130393763 -35643666653037396334323435666537366637313035383434386662343938316439393062333263 -36653834613063626439343666303661386264626534626237663037643635616562383834366564 -38373161323562393966356534353736393663363536373137386565393231656532323234363130 -37333563636362623831343333646362356166353162323333313961646133633535363133636562 -31623632323133313234336162356464613462356436313365663034383366373137326332353439 -38383863353536373334363434313933636537306262396163343436616535623035323965316634 -62636561666239633439663064316539373963316164373562363563326538643636323962346466 -62376330313262363331663839303432633763363433303030663132363333636433616338653732 -65356664386135363966323035366566306234356135363634353062326232343565383536313536 -36653065303938626135643630363834663333313039643533623132323039386466636434363939 -36316335366535356435623937616638353866626230326635356134336331356431343937346139 -30643535336261383233626632373331333565376233643031633739373539303132383764353434 -37303833613737326132613337623635353730623261356661623466393732303631353932366164 -36366465626631383131653037336531626530643532633532313064623233613338636566366339 -62663763633634343439373631303636353231663566626166346636323839643830646366656430 -61356361613332316438633064623737343161653964363361363837313431653565313130636630 -33336234303762643166323233303732313330623434356136623031323335383663386631383434 -33663433366439376539336239393966633162373262316539623038313434376266353065393436 -32656437633063323363343666346230303432306631616264303761366361316130386234643835 -63323635383366343035346238316364666239623762393637343139636131333230343661656230 -39346261633237333233663661326263353364353139663463333663323730356662613738656235 -35643632393935653137643265353333383365383865363264386538396666646638373863303133 -65636166383036356131306365663732343337383263346130343266653930323332363337653533 -66633736343431666263666634643431623533646636326264313962343630383935 +65646130623036313263343431666430653966663232356233373965386534383234313231643234 +6135633535643736386537393437303130666330386265640a373136373833663039663034323939 +31393539613530613566393431333635343532383763333563656162666631653766663931383833 +6432653433343635620a623463316262343663306339353332326663343333666432633463633635 +62336430356162393233363030376233343735353038616665336164366362326134333134393765 +33656330363532636533383439616435613238323664363966306431356131386438346231353930 +64323165373638353132363438646139316337656266323666623033346131303966336638633037 +34333635613766346330656463343332343335393835663966316639383133633566326564383736 +34323663363533386435646239313866666431346138373430303838333162346339383963373763 +35353964306463336134393334316436633763666130316366333062646336393363626538363338 +37633033343533326631316631363338613266636539383630386137373461626239656566353834 +34653266303437613332306266376338326533343861666330633938346435643561383136316130 +34313739636130343665306335303538303365326336613763613138376135656439663562663862 +32313039636366316562313562656662336563613065666662386237636636386237313861663232 +61643330386635633339633230376565663035396136636364373237643238336534616436623835 +64633866373262303736393032373762616437653030666264313636323539353233663632363532 +34323939316139373032356632633165353339383665346435366361633261623838313937333837 +33306430323334366436373664323164366661323139376330326534346234396331376634643065 +35626538616263376437653865626161336435303164343834613138643661656261643234393362 +32623737303131633863663731636262343063316663313565313238346565326436303863663432 +37633734663331616561633331633833616232346332356431363134666430313435336134633361 +61353633623032666535643561383264303766333636666438333038323966636566373133346530 +36313566636337316265643563343965623538336161303165396337613462613530343864643431 +64623233623664393237663130386366623065666532303633303964316331376338336461343561 +61346430356238326333323835636465316438373266333864643162313161316264373538303338 +33336434373565343761393632613632333133373135373666313439663034396536313766373263 +38316434633461363533343063353139303466643834383836373636373362373538663761346464 +65333534363937343261303336386431616236643361396264663532316163623438333533346662 +33303566346161643839633031656538346333343233363839343733366564333735376264623034 +33646566363365653639333332393632343530353339336461323765386133613539626466643962 +30636332393464393264323736313130346566633461623331373530303534303835323333303266 +31363333643834386263353065366635663562613165633038306637333762663230343662386666 +35316533653465613035313439353263383736303530666366656539616437346435323365636236 +64373431396131643363346437636465663566663039343165633863323261386462363361336165 +33663738653839653064613561383863616463356139393032643730636336616239346434373234 +64653164633961336135663162393362363362393338346232663163373136356430356464316562 +61623461626164386436383838376664323139653237376164623933653063316566373437363230 +62303561353164356665386135383963626531313961653936393736366237393032373766393163 +31383262653530383831353061323237356434313135396332393563363336343466383437336266 +61646334373632643161313639366431626134326532316637616134616165663061316533356266 +35373337636464396338386133633963663034383363376666623130653531646633336431363862 +33343739313636333537636462303534386139633764333563613064663434346462333661653466 +33316138656238616534653663633236623466373964376337316166366232636362636230336361 +32363639343262316164356361656135383062346634643734613062623962336464343735353833 +62626335353363336561323039346462386338393163326466323935353865373631313965666466 +38323132333465356133383639326461356162303564623834323965323735356230363938613865 +31356461623631316237393837376635313262383336653931613432373263353930376466626434 +66373339346537323338356464393737333236373366353831333230323866393061346564326238 +63666263623665653533626236666531383137653036386566333735343734613561356335633665 +32653835656538646434613732306566356636626531626130646331376130613636333238643363 +37353764393135313164636466373036346466343163393835636265366330393566653335333234 +65346230333364633038643130633666353639643839313761623830353162663932323231363261 +62383861663832323733323366623130396561363166313637393935646237316333623733636234 +66623962383533396136383733333230623838633966346162333438303230323062376335343532 +36306133316136656539646430346338643065336532343235636339646339616161656661653735 +61346538333262383363353634653666323533626530393839333361323362336434346662663036 +63623766633532653232316436613539646433346235393531323738386233353830383037396261 +35303538656432313561373364373062353531633332356430323233303735363130623262316536 +34303134356135373930333338663966306237656536616365646537643937343262383634616234 +64613434323630336334613537353333386636373363336531646436373938333136646665613433 +63313438623564656438623239353930386461623534343464363462643131636464363834383263 +32353632653930346431343237316333323139353632663330393165626534633939626430316563 +38303538376231646132643262623966643561313161333462326637666566356662336434366462 +62323662643066303532383566363432306537353131653930663039643033323536623966643531 +66616634323863613538393338373132363063666438663335376563636335626561636234323834 +65326563336331373138336561376565313965393136336334646437373632613131396666643762 +63663865616431353535306534616234666135626339633864633033373032313230373664613433 +36303666396435333936613866303366373639346166346433333362663862616462353039383138 +6166 diff --git a/terraform/fabrikken.tf b/terraform/fabrikken.tf new file mode 100644 index 0000000..a4a3986 --- /dev/null +++ b/terraform/fabrikken.tf @@ -0,0 +1,45 @@ +resource "proxmox_vm_qemu" "fabrikken" { + name = "fabrikken" + desc = "Factorio VM" + target_node = "hermes" + + agent = 1 + onboot = true + + clone = "VM 9004" + cores = 4 + sockets = 1 + cpu = "host" + memory = 4096 + + # Setup the disk + disks { + ide { + ide2 { + cloudinit { + storage = "basseng" + } + } + } + scsi { + scsi0 { + disk { + size = "10G" + storage = "basseng" + } + } + } + } + + + network { + bridge = "vmbr0" + model = "virtio" + } + scsihw = "virtio-scsi-pci" + os_type = "cloud-init" + ipconfig0 = "ip=192.168.1.31/24,gw=192.168.1.1" + nameserver = "192.168.1.69" + ciuser = "ansible" + sshkeys = var.ssh_public_key +} \ No newline at end of file diff --git a/terraform/matmonster.tf b/terraform/matmonster.tf index 2f2db21..949c4b1 100644 --- a/terraform/matmonster.tf +++ b/terraform/matmonster.tf @@ -1,16 +1,16 @@ resource "proxmox_vm_qemu" "matmonster" { name = "matmonster" desc = "Feed the beast server" - target_node = "hermes" + target_node = "oceanus" agent = 1 onboot = true - clone = "VM 9004" + clone = "VM 9005" cores = 4 sockets = 1 cpu = "host" - memory = 8192 + memory = 9024 # Setup the disk disks {