Skip to content

Commit c5c1249

Browse files
committed
fix: wpb-22439 allow rabbitmq ansible inventory for wiab-staging
1 parent 57470ac commit c5c1249

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

ansible/inventory/demo/wiab-staging.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ wiab-staging:
66
ansible_user: 'demo'
77
ansible_ssh_private_key_file: "~/.ssh/id_ed25519"
88
vars:
9-
artifact_hash: 0960ed6d4ad47c774f25c6308f74ef2fad3689b5
9+
artifact_hash: cdf194bb9185a5c2e01d6d41218bd1393c513364

ansible/inventory/offline/staging.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ all:
66
-o UserKnownHostsFile=/dev/null
77
-o ControlMaster=auto
88
-o ControlPersist=60s
9-
# ssh private_key is stored in wire-server-deploy/ssh
10-
# assuming all ansible commands will be issued from wire-server-deploy
11-
ansible_ssh_private_key_file: "ssh/id_ed25519"
9+
# ssh private_key is stored in wire-server-deploy/ssh in case vms are created using bin/offline-vm-setup.sh
10+
# in case of terraform automated-tests, it will be vailable via forwarded ssh agents
11+
# ansible_ssh_private_key_file: "ssh/id_ed25519"
1212

1313
assethost:
1414
hosts:
@@ -38,6 +38,8 @@ k8s-cluster:
3838
kube-master: {}
3939

4040
datanodes:
41+
# host names here must match each node's actual hostname
42+
# its a requirement for rabbitmq
4143
hosts:
4244
datanode1:
4345
ansible_host: "datanode1_ip"
@@ -72,11 +74,13 @@ minio:
7274
vars:
7375
minio_network_interface: enp1s0
7476

75-
rabbitmq:
77+
rmq-cluster:
7678
children:
7779
datanodes: {}
7880
vars:
7981
rabbitmq_network_interface: enp1s0
82+
# host name here must match each node's actual hostname
83+
rabbitmq_cluster_master: datanode1
8084

8185
postgresql:
8286
children:

ansible/wiab-staging-provision.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,8 @@
255255
yq -i ".cassandra.vars.cassandra_network_interface |= \"$GATEWAY_NAME\"" "{{ inventory_file }}"
256256
yq -i ".elasticsearch.vars.elasticsearch_network_interface |= \"$GATEWAY_NAME\"" "{{ inventory_file }}"
257257
yq -i ".minio.vars.minio_network_interface |= \"$GATEWAY_NAME\"" "{{ inventory_file }}"
258-
yq -i ".rabbitmq.vars.rabbitmq_network_interface |= \"$GATEWAY_NAME\"" "{{ inventory_file }}"
258+
yq -i ".rmq-cluster.vars.rabbitmq_network_interface |= \"$GATEWAY_NAME\"" "{{ inventory_file }}"
259+
yq -i ".rmq-cluster.vars.rabbitmq_cluster_master |= \"datanode1\"" "{{ inventory_file }}"
259260
yq -i ".postgresql.vars.postgresql_network_interface |= \"$GATEWAY_NAME\"" "{{ inventory_file }}"
260261
args:
261262
executable: /bin/bash

0 commit comments

Comments
 (0)