From 3dae84678f652d9613202c59ed2e8426e0dae431 Mon Sep 17 00:00:00 2001 From: HACKERMD Date: Wed, 5 Apr 2017 23:29:33 +0200 Subject: [PATCH] Update templates --- etc/multinode_setup_gce.yml | 27 +++++++++++++++++------- etc/multinode_setup_os.yml | 41 ++++++++++++++++++++++++++++--------- 2 files changed, 51 insertions(+), 17 deletions(-) diff --git a/etc/multinode_setup_gce.yml b/etc/multinode_setup_gce.yml index a9038f8..dc457a7 100644 --- a/etc/multinode_setup_gce.yml +++ b/etc/multinode_setup_gce.yml @@ -14,21 +14,29 @@ architecture: count: 1 groups: - name: tissuemaps_db_master + vars: + pg_max_worker_processes: 16 + pg_shared_buffer: 20GB + pg_effective_cache_size: 40GB - name: ganglia_client instance: - volume_size: 1000 + volume_size: 7000 disk_size: 30 image: ubuntu-1404-trusty-v20161020 flavor: n1-highcpu-16 tags: - storage - name: worker - count: 2 + count: 5 groups: - name: tissuemaps_db_worker + vars: + pg_max_worker_processes: 4 + pg_shared_buffer: 5GB + pg_effective_cache_size: 10GB - name: ganglia_client instance: - volume_size: 1000 + volume_size: 7000 disk_size: 30 image: ubuntu-1404-trusty-v20161020 flavor: n1-highcpu-4 @@ -37,12 +45,12 @@ architecture: - name: glusterfs node_types: - name: server - count: 2 + count: 5 groups: - name: glusterfs_server - name: ganglia_client instance: - volume_size: 1000 + volume_size: 7000 disk_size: 30 image: ubuntu-1404-trusty-v20161020 flavor: n1-standard-2 @@ -54,11 +62,14 @@ architecture: count: 1 groups: - name: tissuemaps_server + vars: + tm_data_directory: /glusterfs/data + tm_log_directory: /glusterfs/log - name: slurm_master - name: glusterfs_client - name: ganglia_client instance: - disk_size: 30 + disk_size: 100 image: ubuntu-1404-trusty-v20161020 flavor: n1-standard-8 tags: @@ -68,11 +79,13 @@ architecture: count: 10 groups: - name: tissuemaps_compute + vars: + tm_data_directory: /glusterfs/data - name: slurm_workers - name: glusterfs_client - name: ganglia_client instance: - disk_size: 30 + disk_size: 100 image: ubuntu-1404-trusty-v20161020 flavor: n1-highmem-4 tags: diff --git a/etc/multinode_setup_os.yml b/etc/multinode_setup_os.yml index 91edf0f..706c574 100644 --- a/etc/multinode_setup_os.yml +++ b/etc/multinode_setup_os.yml @@ -6,78 +6,99 @@ cloud: provider: os region: RegionOne + architecture: name: tissuemaps + clusters: + - name: postgresql node_types: - name: master count: 1 groups: - name: tissuemaps_db_master + vars: + pg_max_worker_processes: 16 + pg_shared_buffer: 20GB + pg_effective_cache_size: 40GB - name: ganglia_client instance: - volume_size: 1000 + volume_size: 7000 image: Ubuntu Server 14.04.04 LTS (2016-05-19) flavor: 16cpu-64ram-hpc tags: - storage - name: worker - count: 2 + count: 5 groups: - name: tissuemaps_db_worker + vars: + pg_max_worker_processes: 4 + pg_shared_buffer: 5GB + pg_effective_cache_size: 10GB - name: ganglia_client instance: - volume_size: 1000 + volume_size: 7000 image: Ubuntu Server 14.04.04 LTS (2016-05-19) flavor: 4cpu-16ram-hpc tags: - storage + - name: glusterfs node_types: - name: server - count: 2 + count: 5 groups: - name: glusterfs_server - name: ganglia_client instance: - volume_size: 1000 + volume_size: 10000 + volume_mountpoint: /srv image: Ubuntu Server 14.04.04 LTS (2016-05-19) flavor: 2cpu-8ram-hpc tags: - storage + - name: slurm node_types: - name: master count: 1 groups: - name: tissuemaps_server + vars: + tm_data_directory: /glusterfs/data + tm_log_directory: /glusterfs/log - name: slurm_master - name: glusterfs_client - name: ganglia_client instance: - image: Matlab-R2016a - ubuntu 14.04.4 x86-64 - (2016-03-17) + image: Matlab-R2016b - ubuntu 16.04.1 (2016-11-02) flavor: 16cpu-64ram-hpc tags: - web - compute - name: worker - count: 10 + count: 50 groups: - name: tissuemaps_compute - - name: slurm_workers + vars: + tm_data_directory: /glusterfs/data + - name: slurm_worker - name: glusterfs_client - name: ganglia_client instance: - image: Matlab-R2016a - ubuntu 14.04.4 x86-64 - (2016-03-17) + image: Matlab-R2016b - ubuntu 16.04.1 (2016-11-02) flavor: 4cpu-16ram-hpc tags: - compute + - name: ganglia - node_teyps: + node_types: - name: server count: 1 groups: + - name: ganglia_server - name: ganglia_client instance: image: Ubuntu Server 14.04.04 LTS (2016-05-19)