summaryrefslogtreecommitdiffstats
path: root/setup/configs
diff options
context:
space:
mode:
Diffstat (limited to 'setup/configs')
-rw-r--r--setup/configs/labels.yml9
-rw-r--r--setup/configs/volumes.yml16
2 files changed, 18 insertions, 7 deletions
diff --git a/setup/configs/labels.yml b/setup/configs/labels.yml
index 1c5f19f..e8ee868 100644
--- a/setup/configs/labels.yml
+++ b/setup/configs/labels.yml
@@ -2,5 +2,12 @@
ands_openshift_labels:
region: "infra"
zone: "default"
- master: "{{ ( 'masters' in group_names ) | ternary(1, 0) }}"
+ hostid: "{{ ands_host_id }}"
+ hostname: "{{ ansible_hostname }}"
+ fqdn: "{{ ansible_hostname }}.{{ ansible_domain }}"
+ master: "{{ (('masters' in group_names) or ( 'new_masters' in group_names )) | ternary(1, 0) }}"
fat_storage: "{{ ( 'storage_nodes' in group_names ) | ternary(1, 0) }}"
+ fat_memory: 0
+ pod_node: 1
+ compute_node: 0
+ gpu_node: 0
diff --git a/setup/configs/volumes.yml b/setup/configs/volumes.yml
index f400eed..f97d485 100644
--- a/setup/configs/volumes.yml
+++ b/setup/configs/volumes.yml
@@ -12,18 +12,22 @@ ands_heketi_domain:
volumes:
heketidbstorage: { type: "cfg" }
+ands_nfs_clients:
+ rw: [ "{{ ands_openshift_public_network }}", "141.52.64.104" ]
+ ro: [ "141.52.64.0/23" ]
+
ands_storage_domains:
- servers: "ands_storage_servers"
- clients: "masters"
+ clients: [ "masters", "new_masters" ]
volumes:
provision: { type: "cfg", mount: "{{ ands_paths.provision }}" }
- openshift: { type: "cfg", mount: "{{ ands_paths.openshift }}" }
+ 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 }}" }
- datastore: { type: "data", mount: "{{ ands_paths.datastore }}" }
- katrin_data: { type: "data", mount: "{{ ands_paths.katrin_data }}" }
+ 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"
+# clients: [ "nodes" ]
# openshift: { type: "cfg", mount: "{{ ands_paths.openshift }}" }
# temporary: { type: "tmp", mount: "{{ ands_paths.temporary }}" }
# volumes: