From cde9667e39394c6b1784d56d8cc022f10d4f1816 Mon Sep 17 00:00:00 2001 From: Brendan Shephard Date: Wed, 27 Nov 2024 12:39:15 +1000 Subject: [PATCH] neutron_metadata_agent compat with bootc Signed-off-by: Brendan Shephard --- roles/edpm_neutron_metadata/tasks/run.yml | 9 +++++++++ roles/edpm_ovn/tasks/run.yml | 13 +++++++++++++ 2 files changed, 22 insertions(+) diff --git a/roles/edpm_neutron_metadata/tasks/run.yml b/roles/edpm_neutron_metadata/tasks/run.yml index f2e0ac6f9..5faad05c4 100644 --- a/roles/edpm_neutron_metadata/tasks/run.yml +++ b/roles/edpm_neutron_metadata/tasks/run.yml @@ -41,3 +41,12 @@ ovn_metadata_agent: "{{ lookup('template', 'ovn_metadata_agent.yaml.j2') | from_yaml }}" edpm_container_standalone_kolla_config_files: ovn_metadata_agent: "{{ lookup('template', 'kolla_ovn_metadata_agent.yaml.j2') | from_yaml }}" + + when: not edpm_use_bootc + +- name: Run ovn_controller container + ansible.builtin.systemd_service: + name: edpm-compute@ovn_metadata_agent + state: started + become: true + when: edpm_use_bootc diff --git a/roles/edpm_ovn/tasks/run.yml b/roles/edpm_ovn/tasks/run.yml index 40762bbac..172f46e77 100644 --- a/roles/edpm_ovn/tasks/run.yml +++ b/roles/edpm_ovn/tasks/run.yml @@ -32,7 +32,20 @@ name: edpm_container_manage tasks_from: shutdown.yml +- name: Run ovn_controller container + ansible.builtin.include_role: + name: osp.edpm.edpm_container_standalone + vars: + edpm_container_standalone_service: ovn_controller + edpm_container_standalone_container_defs: + ovn_controller: "{{ lookup('template', 'ovn_controller.yaml.j2') | from_yaml }}" + edpm_container_standalone_kolla_config_files: + ovn_controller: "{{ lookup('template', 'kolla_ovn_controller.yaml.j2') | from_yaml }}" + when: not edpm_use_bootc + - name: Run ovn_controller container ansible.builtin.systemd_service: name: edpm-compute@ovn_controller state: started + become: true + when: edpm_use_bootc