From f3c41dd13a0a86382b80d564e9de0d6b06fb1dbf Mon Sep 17 00:00:00 2001 From: "Suren A. Chilingaryan" Date: Sun, 11 Mar 2018 19:56:38 +0100 Subject: Various fixes before moving to hardware installation --- inventories/staging.erb | 48 ++++++++++++++++++++++++++------------- inventories/testing.erb | 60 +++++++++++++++++++++++++++++++++++-------------- 2 files changed, 76 insertions(+), 32 deletions(-) (limited to 'inventories') diff --git a/inventories/staging.erb b/inventories/staging.erb index dc3bcb2..aa9e935 100644 --- a/inventories/staging.erb +++ b/inventories/staging.erb @@ -1,46 +1,52 @@ [masters] 192.168.226.[1:2] +[etcd] +192.168.226.[1:3] + [simple_storage_nodes] 192.168.226.[3:3] -[external_storage_servers] -#192.168.226.[4:4] - [simple_nodes] +[external_storage_servers] + [staging:children] nodes +new_nodes +etcd +new_etcd external_storage_servers vagrant [virtual:children] nodes +new_nodes +etcd +new_etcd external_storage_servers - [OSEv3:children] masters +new_masters nodes +new_nodes etcd +new_etcd -[glusterfs:children] -masters -simple_storage_nodes - -[etcd:children] +[nodes:children] masters simple_storage_nodes +simple_nodes [storage_nodes:children] masters +new_masters simple_storage_nodes +new_simple_storage_nodes -[nodes:children] -masters -simple_storage_nodes -simple_nodes - +[glusterfs:children] +storage_nodes #[lb] #master1.example.com @@ -49,9 +55,11 @@ simple_nodes #[glusterfs_registry] #192.168.10.14 glusterfs_ip=192.168.10.14 glusterfs_devices='[ "/dev/xvdc", "/dev/xvdd" ]' - [ands_servers:children] nodes +new_nodes +etcd +new_etcd external_storage_servers [ands_storage_servers:children] @@ -63,3 +71,13 @@ ands_servers [vagrant] ipepdvcompute3.ipe.kit.edu vagrant_project=staging + +[new_masters] +[new_etcd] +[new_simple_storage_nodes] +[new_simple_nodes] + +[new_nodes:children] +new_masters +new_simple_storage_nodes +new_simple_nodes diff --git a/inventories/testing.erb b/inventories/testing.erb index b8b5f48..f9d27ae 100644 --- a/inventories/testing.erb +++ b/inventories/testing.erb @@ -1,50 +1,66 @@ [masters] -ipekatrin[1:2].katrin.kit.edu +ipekatrin[1:2].ipe.kit.edu -[simple_storage_nodes] -ipekatrin[3:3].katrin.kit.edu -#ipetest.katrin.kit.edu ands_host_id=5 +[etcd] +ipekatrin[1:3].ipe.kit.edu -[external_storage_servers] -#ipekatrin[4:4].katrin.kit.edu +[simple_storage_nodes] +ipekatrin[3:3].ipe.kit.edu [simple_nodes] -#ipekatrin[3:3].katrin.kit.edu -#strnage_name.katrin.kit.edu ands_host_id=1 +#ipecompute1.katrin.kit.edu ands_host_id=4 + +[external_storage_servers] [testing:children] nodes +new_nodes +etcd +new_etcd external_storage_servers vagrant [virtual:children] nodes +new_nodes +etcd +new_etcd external_storage_servers [OSEv3:children] masters +new_masters nodes +new_nodes etcd +new_etcd -[glusterfs:children] -masters -simple_storage_nodes - -[etcd:children] +[nodes:children] masters simple_storage_nodes +simple_nodes [storage_nodes:children] masters +new_masters simple_storage_nodes +new_simple_storage_nodes -[nodes:children] -masters -simple_storage_nodes -simple_nodes +[glusterfs:children] +storage_nodes + +#[lb] +#master1.example.com +#[nfs] +#master1.example.com +#[glusterfs_registry] +#192.168.10.14 glusterfs_ip=192.168.10.14 glusterfs_devices='[ "/dev/xvdc", "/dev/xvdd" ]' [ands_servers:children] nodes +new_nodes +etcd +new_etcd external_storage_servers [ands_storage_servers:children] @@ -56,3 +72,13 @@ ands_servers [vagrant] ipepdvcompute3.ipe.kit.edu vagrant_project=testing + +[new_masters] +[new_etcd] +[new_simple_storage_nodes] +[new_simple_nodes] + +[new_nodes:children] +new_masters +new_simple_storage_nodes +new_simple_nodes -- cgit v1.2.1