Skip to content

allow to split metrix VM from slurm/database VM #535

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

Open
mboisson wants to merge 1 commit into
base: main
Choose a base branch
from
Open

allow to split metrix VM from slurm/database VM #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ ENC_CMD="eyaml encrypt -o block --pkcs7-public-key=${PKCS7_KEY}"
$ENC_CMD -l 'profile::freeipa::server::ds_password' -s $(openssl rand -base64 9)
$ENC_CMD -l 'profile::freeipa::server::admin_password' -s $(openssl rand -base64 9)
$ENC_CMD -l 'metrix::password' -s $(openssl rand -base64 9)
$ENC_CMD -l 'metrix::slurm_password' -s $(openssl rand -base64 9)
$ENC_CMD -l 'metrix::root_api_token' -s $(openssl rand -hex 20)
) > /etc/puppetlabs/code/environments/production/data/bootstrap.yaml

Expand Down
3 changes: 2 additions & 1 deletion data/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,11 +344,12 @@ profile::prometheus::slurm_job_exporter::version: 0.4.9

metrix::prometheus_ip: "%{alias('terraform.tag_ip.mgmt.0')}"
metrix::ldap_password: "%{alias('profile::freeipa::server::admin_password')}"
metrix::slurm_password: "%{alias('profile::slurm::accounting::password')}"
metrix::slurm_user: 'metrix'
metrix::cluster_name: "%{alias('profile::slurm::base::cluster_name')}"
metrix::prometheus_port: 9090
metrix::db_ip: 127.0.0.1
metrix::db_port: 3306
metrix::slurm_db_port: 3306
metrix::install::version: 1.6.0
metrix::subdomain: 'metrix'

Expand Down
10 changes: 10 additions & 0 deletions site/profile/manifests/metrix.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
$int_domain_name = lookup('profile::freeipa::base::ipa_domain')
$base_dn = join(split($int_domain_name, '[.]').map |$dc| { "dc=${dc}" }, ',')

if lookup('terraform.tag_ip.metrix.0') != lookup('terraform.tag_ip.mgmt.0') {
$slurm_db_ip = lookup('terraform.tag_ip.mgmt.0')
}
else {
$slurm_db_ip = '127.0.0.1'
}
class { 'metrix':
root_api_token => lookup('metrix::root_api_token'),
password => lookup('metrix::password'),
Expand All @@ -23,12 +29,16 @@
db_ip => lookup('metrix::db_ip'),
db_port => lookup('metrix::db_port'),
ldap_password => lookup('metrix::ldap_password'),
slurm_user => lookup('metrix::slurm_user'),
slurm_password => lookup('metrix::slurm_password'),
slurm_db_ip => $slurm_db_ip,
slurm_db_port => lookup('metrix::slurm_db_port'),
cluster_name => lookup('metrix::cluster_name'),
subdomain => lookup('metrix::subdomain'),
logins => $logins,
base_dn => $base_dn,
domain_name => $domain_name,
auth_type => lookup('metrix::auth_type')
}
Class['metrix'] ~> Service['httpd']
}
20 changes: 19 additions & 1 deletion site/profile/manifests/slurm.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,16 @@
Hash[String, Array[String]] $users = {},
Integer $dbd_port = 6819
) {
include mysql::server

if lookup('terraform.tag_ip.metrix.0') != lookup('terraform.self.local_ip') {
class { 'mysql::server':
override_options => { 'mysqld' => { 'bind-address' => lookup('terraform.self.local_ip') } }
}
}
else {
include mysql::server
}

include profile::slurm::base

mysql::db { 'slurm_acct_db':
Expand All @@ -308,6 +317,15 @@
grant => ['ALL'],
}

mysql::db { 'slurm_acct_db_metrix':
ensure => present,
dbname => 'slurm_acct_db',
user => lookup('metrix::slurm_user'),
password => lookup('metrix::slurm_password'),
host => lookup('terraform.tag_ip.metrix.0'),
grant => ['SELECT'],
}

file { '/etc/slurm/slurmdbd.conf':
ensure => present,
content => epp('profile/slurm/slurmdbd.conf',
Expand Down