openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fixing kolla_container_engine option"

Browse Source
This commit is contained in:
Zuul 2023-06-22 11:18:03 +00:00 committed by Gerrit Code Review
commit 3497cb6fb8
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/openvswitch/templates/ovs-vsctl.j2
View File

@ -1,3 +1,3 @@
#!/bin/bash
exec docker exec openvswitch_vswitchd ovs-vsctl "$@"
exec {{ kolla_container_engine }} exec openvswitch_vswitchd ovs-vsctl "$@"

8
ansible/roles/ovn-db/tasks/bootstrap-db.yml
View File

@ -1,7 +1,7 @@
---
- name: Get OVN_Northbound cluster leader
become: true
command: "docker exec ovn_nb_db ovs-appctl -t /var/run/ovn/ovnnb_db.ctl cluster/status OVN_Northbound"
command: "{{ kolla_container_engine }} exec ovn_nb_db ovs-appctl -t /var/run/ovn/ovnnb_db.ctl cluster/status OVN_Northbound"
changed_when: False
register: ovn_nb_cluster_status
@ -9,12 +9,12 @@
vars:
search_string: "Role: leader"
become: true
command: "docker exec ovn_nb_db ovn-nbctl --inactivity-probe={{ ovn_nb_db_inactivity_probe }} set-connection ptcp:{{ ovn_nb_db_port }}:0.0.0.0"
command: "{{ kolla_container_engine }} exec ovn_nb_db ovn-nbctl --inactivity-probe={{ ovn_nb_db_inactivity_probe }} set-connection ptcp:{{ ovn_nb_db_port }}:0.0.0.0"
when: ovn_nb_cluster_status is search(search_string)
- name: Get OVN_Southbound cluster leader
become: true
command: "docker exec ovn_sb_db ovs-appctl -t /var/run/ovn/ovnsb_db.ctl cluster/status OVN_Southbound"
command: "{{ kolla_container_engine }} exec ovn_sb_db ovs-appctl -t /var/run/ovn/ovnsb_db.ctl cluster/status OVN_Southbound"
changed_when: False
register: ovn_sb_cluster_status
@ -22,7 +22,7 @@
vars:
search_string: "Role: leader"
become: true
command: "docker exec ovn_sb_db ovn-sbctl --inactivity-probe={{ ovn_sb_db_inactivity_probe }} set-connection ptcp:{{ ovn_sb_db_port }}:0.0.0.0"
command: "{{ kolla_container_engine }} exec ovn_sb_db ovn-sbctl --inactivity-probe={{ ovn_sb_db_inactivity_probe }} set-connection ptcp:{{ ovn_sb_db_port }}:0.0.0.0"
when: ovn_sb_cluster_status is search(search_string)
- name: Wait for ovn-nb-db

4
ansible/roles/rabbitmq/tasks/remove-ha-all-policy.yml
View File

@ -11,13 +11,13 @@
- block:
- name: List RabbitMQ policies
become: true
command: "docker exec {{ service.container_name }} rabbitmqctl list_policies --silent"
command: "{{ kolla_container_engine }} exec {{ service.container_name }} rabbitmqctl list_policies --silent"
register: rabbitmq_policies
changed_when: false
- name: Remove ha-all policy from RabbitMQ
become: true
command: "docker exec {{ service.container_name }} rabbitmqctl clear_policy ha-all"
command: "{{ kolla_container_engine }} exec {{ service.container_name }} rabbitmqctl clear_policy ha-all"
when:
- "'ha-all' in rabbitmq_policies.stdout"
when: container_facts[service.container_name] is defined