Skip to content

Commit

Permalink
Merge pull request #648 from stackhpc/upstream/2024.1-2024-12-09
Browse files Browse the repository at this point in the history
Synchronise 2024.1 with upstream
priteau authored Dec 9, 2024
2 parents 3ee5f71 + 41f45d2 commit 840359a
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions ansible/roles/rabbitmq/tasks/version-check.yml
Original file line number Diff line number Diff line change
@@ -22,6 +22,7 @@
kolla_container:
action: "start_container"
command: "rabbitmqctl --version"
common_options: "{{ docker_common_options }}"
container_engine: "{{ kolla_container_engine }}"
detach: false
environment:
2 changes: 1 addition & 1 deletion tests/templates/ceph-inventory.j2
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[storage]
{% for host in hostvars %}
{% for host in hostvars | reject('equalto', 'localhost') %}
{{ host }} ansible_host={{ hostvars[host]['ansible_host'] }}
{% endfor %}

2 changes: 1 addition & 1 deletion tests/templates/globals-default.j2
Original file line number Diff line number Diff line change
@@ -154,7 +154,7 @@ enable_redis: "yes"

enable_ceph_rgw: "yes"
ceph_rgw_hosts:
{% for host in hostvars %}
{% for host in hostvars | reject('equalto', 'localhost') %}
- host: {{ host }}
ip: {{ hostvars[host]['ansible_host'] }}
port: 6780

0 comments on commit 840359a

Please sign in to comment.