diff --git a/data/hostname/banco.softwareheritage.org.yaml b/data/hostname/banco.softwareheritage.org.yaml index 5d99cea258afeb742b26a31828af03a46d1e49cf..c0db6a26cb3e9b4e00d4635a02dd317f001549ff 100644 --- a/data/hostname/banco.softwareheritage.org.yaml +++ b/data/hostname/banco.softwareheritage.org.yaml @@ -5,6 +5,12 @@ smtp::mynetworks: - 192.168.128.0/24 # storage array, for notification emails - 192.168.129.0/24 # storage array, for notification emails +# local cache is not compatible with rancher +dns::local_cache: false +dns::nameservers: + - 192.168.100.29 + - 192.168.200.22 + smtp::mail_aliases: - user: barman aliases: @@ -86,3 +92,7 @@ icinga2::host::vars: disk /srv/storage/f: disk_wfree: '6%' disk_cfree: '3%' + +zfs::common::zpool_configuration: + disk: + - scsi-SDELL_PERC_H730_Mini_003b2814132815c21d00aa6038708741-part3 diff --git a/manifests/site.pp b/manifests/site.pp index 0114fa6cd92362717375b4465f3a98cc10a2b46d..e18fb5cf261c71d8f51f73d21ef76d884e8adef9 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -42,8 +42,7 @@ node /^(belvedere|somerset|massmoca|albertina).(internal.)?softwareheritage.org$ } node 'banco.softwareheritage.org' { - include role::swh_backup - include role::postgresql_backup + include role::objstorage_rancher_node } node /^esnode\d+.(internal.)?softwareheritage.org$/ { diff --git a/site-modules/role/manifests/objstorage_rancher_node.pp b/site-modules/role/manifests/objstorage_rancher_node.pp new file mode 100644 index 0000000000000000000000000000000000000000..7470639f0f10d031f597c2c7b93fe94d8b402013 --- /dev/null +++ b/site-modules/role/manifests/objstorage_rancher_node.pp @@ -0,0 +1,16 @@ +class role::objstorage_rancher_node inherits role::swh_server { + # role::backup + include profile::swh::deploy::objstorage + include profile::swh::deploy::objstorage_ceph + include profile::megacli + include profile::borg::repository_server + + # role::postgresql_backup + include profile::postgresql::backup + + # role::rancher_node + include profile::zfs::kubelet + include profile::zfs::rancher + include profile::mountpoints + include profile::kubernetes +}