diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2018-03-11 19:56:38 +0100 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2018-03-11 19:56:38 +0100 |
| commit | f3c41dd13a0a86382b80d564e9de0d6b06fb1dbf (patch) | |
| tree | 3522ce77203da92bb2b6f7cfa2b0999bf6cc132c /setup/configs | |
| parent | 6bc3a3ac71e11fb6459df715536fec373c123a97 (diff) | |
| download | ands-f3c41dd13a0a86382b80d564e9de0d6b06fb1dbf.tar.gz ands-f3c41dd13a0a86382b80d564e9de0d6b06fb1dbf.tar.bz2 ands-f3c41dd13a0a86382b80d564e9de0d6b06fb1dbf.tar.xz ands-f3c41dd13a0a86382b80d564e9de0d6b06fb1dbf.zip | |
Various fixes before moving to hardware installation
Diffstat (limited to 'setup/configs')
| -rw-r--r-- | setup/configs/labels.yml | 9 | ||||
| -rw-r--r-- | setup/configs/volumes.yml | 11 |
2 files changed, 17 insertions, 3 deletions
diff --git a/setup/configs/labels.yml b/setup/configs/labels.yml index e8ee868..3f8cbe4 100644 --- a/setup/configs/labels.yml +++ b/setup/configs/labels.yml @@ -2,6 +2,9 @@ ands_openshift_labels: region: "infra" zone: "default" + production: 1 + server: 1 + permanent: 1 hostid: "{{ ands_host_id }}" hostname: "{{ ansible_hostname }}" fqdn: "{{ ansible_hostname }}.{{ ansible_domain }}" @@ -11,3 +14,9 @@ ands_openshift_labels: pod_node: 1 compute_node: 0 gpu_node: 0 + + + +ands_default_node_selector: + zone: default + production: "1" diff --git a/setup/configs/volumes.yml b/setup/configs/volumes.yml index f97d485..14aadfa 100644 --- a/setup/configs/volumes.yml +++ b/setup/configs/volumes.yml @@ -18,16 +18,21 @@ ands_nfs_clients: ands_storage_domains: - servers: "ands_storage_servers" - clients: [ "masters", "new_masters" ] + clients: [ "nodes", "new_nodes" ] volumes: provision: { type: "cfg", mount: "{{ ands_paths.provision }}" } + - servers: "ands_storage_servers" + clients: [ "masters", "new_masters" ] + volumes: +# provision: { type: "cfg", mount: "{{ ands_paths.provision }}" } openshift: { type: "cfg", mount: "{{ ands_paths.openshift }}", nfs_clients: "{{ ands_nfs_clients }}" } databases: { type: "db", mount: "{{ ands_paths.databases }}" } temporary: { type: "tmp", mount: "{{ ands_paths.temporary }}", nfs_clients: "{{ ands_nfs_clients }}" } datastore: { type: "data", mount: "{{ ands_paths.datastore }}", nfs_clients: "{{ ands_nfs_clients }}" } katrin_data: { type: "data", mount: "{{ ands_paths.katrin_data }}", nfs_clients: "{{ ands_nfs_clients }}" } -# - servers: "storage_nodes" -# clients: [ "nodes" ] + +# - servers: "ands_storage_servers" +# clients: [ "nodes", "new_nodes" ] # openshift: { type: "cfg", mount: "{{ ands_paths.openshift }}" } # temporary: { type: "tmp", mount: "{{ ands_paths.temporary }}" } # volumes: |