fix: wpb-22439 merge from wpb-21356-minor-fixes

Author: mohitrajain

ansible/inventory/offline/staging.yml

@@ -37,66 +37,46 @@ k8s-cluster:
     kube-node: {}
     kube-master: {}
 
-cassandra:
+datanodes:
   hosts:
-    cassandra1:
+    datanode1:
       ansible_host: "datanode1_ip"
-    cassandra2:
+    datanode2:
       ansible_host: "datanode2_ip"
-    cassandra3:
+    datanode3:
       ansible_host: "datanode3_ip"
+
+cassandra:
+  children:
+    datanodes: {}
   vars:
     cassandra_network_interface: enp1s0
 
 cassandra_seed:
   hosts:
-    cassandra1: {}
+    datanode1: {}
 
 elasticsearch:
-  hosts:
-    elasticsearch1:
-      ansible_host: "datanode1_ip"
-    elasticsearch2:
-      ansible_host: "datanode2_ip"
-    elasticsearch3:
-      ansible_host: "datanode3_ip"
+  children:
+    datanodes: {}
   vars:
     elasticsearch_network_interface: enp1s0
 
-elasticsearch_master:
-  children:
-    elasticsearch: {}
-
 minio:
-  hosts:
-    minio1:
-      ansible_host: "datanode1_ip"
-    minio2:
-      ansible_host: "datanode2_ip"
-    minio3:
-      ansible_host: "datanode3_ip"
+  children:
+    datanodes: {}
   vars:
     minio_network_interface: enp1s0
 
 rabbitmq:
-  hosts:
-    rabbitmq1:
-      ansible_host: "datanode1_ip"
-    rabbitmq2:
-      ansible_host: "datanode2_ip"
-    rabbitmq3:
-      ansible_host: "datanode3_ip"
+  children:
+    datanodes: {}
   vars:
     rabbitmq_network_interface: enp1s0
 
 postgresql:
-  hosts:
-    postgresql1:
-      ansible_host: "datanode1_ip"
-    postgresql2:
-      ansible_host: "datanode2_ip"
-    postgresql3:
-      ansible_host: "datanode3_ip"
+  children:
+    datanodes: {}
   vars:
     wire_dbname: wire-server
     postgresql_network_interface: enp1s0

ansible/wiab-staging-provision.yml

@@ -38,7 +38,6 @@
         - lsof
         - net-tools
         - rsyslog
-        - screen
         - sudo
         - vim
         - wget
@@ -276,21 +275,9 @@
         yq -i ".kube_node.hosts.kubenode1.ansible_host |= \"$kubenode1_ip\"" "{{ inventory_file }}"
         yq -i ".kube_node.hosts.kubenode2.ansible_host |= \"$kubenode2_ip\"" "{{ inventory_file }}"
         yq -i ".kube_node.hosts.kubenode3.ansible_host |= \"$kubenode3_ip\"" "{{ inventory_file }}"
-        yq -i ".cassandra.hosts.cassandra1.ansible_host |= \"$datanode1_ip\"" "{{ inventory_file }}"
-        yq -i ".cassandra.hosts.cassandra2.ansible_host |= \"$datanode2_ip\"" "{{ inventory_file }}"
-        yq -i ".cassandra.hosts.cassandra3.ansible_host |= \"$datanode3_ip\"" "{{ inventory_file }}"
-        yq -i ".elasticsearch.hosts.elasticsearch1.ansible_host |= \"$datanode1_ip\"" "{{ inventory_file }}"
-        yq -i ".elasticsearch.hosts.elasticsearch2.ansible_host |= \"$datanode2_ip\"" "{{ inventory_file }}"
-        yq -i ".elasticsearch.hosts.elasticsearch3.ansible_host |= \"$datanode3_ip\"" "{{ inventory_file }}"
-        yq -i ".minio.hosts.minio1.ansible_host |= \"$datanode1_ip\"" "{{ inventory_file }}"
-        yq -i ".minio.hosts.minio2.ansible_host |= \"$datanode2_ip\"" "{{ inventory_file }}"
-        yq -i ".minio.hosts.minio3.ansible_host |= \"$datanode3_ip\"" "{{ inventory_file }}"
-        yq -i ".rabbitmq.hosts.rabbitmq1.ansible_host |= \"$datanode1_ip\"" "{{ inventory_file }}"
-        yq -i ".rabbitmq.hosts.rabbitmq2.ansible_host |= \"$datanode2_ip\"" "{{ inventory_file }}"
-        yq -i ".rabbitmq.hosts.rabbitmq3.ansible_host |= \"$datanode3_ip\"" "{{ inventory_file }}"
-        yq -i ".postgresql.hosts.postgresql1.ansible_host |= \"$datanode1_ip\"" "{{ inventory_file }}"
-        yq -i ".postgresql.hosts.postgresql2.ansible_host |= \"$datanode2_ip\"" "{{ inventory_file }}"
-        yq -i ".postgresql.hosts.postgresql3.ansible_host |= \"$datanode3_ip\"" "{{ inventory_file }}"
+        yq -i ".datanodes.hosts.datanode1.ansible_host |= \"$datanode1_ip\"" "{{ inventory_file }}"
+        yq -i ".datanodes.hosts.datanode2.ansible_host |= \"$datanode2_ip\"" "{{ inventory_file }}"
+        yq -i ".datanodes.hosts.datanode3.ansible_host |= \"$datanode2_ip\"" "{{ inventory_file }}"
         
         # Update network interface variables with gateway name
         yq -i ".cassandra.vars.cassandra_network_interface |= \"$GATEWAY_NAME\"" "{{ inventory_file }}"