Skip to content

Commit

Permalink
[WIP] use edpm_ovs role for ovs installation
Browse files Browse the repository at this point in the history
This leading to ovs upgrade during adoption as
package name was hardcoded in edpm_ovn bootstrap play,
reusing edpm_ovs role for this.
  • Loading branch information
karelyatin committed Sep 26, 2024
1 parent 91825f1 commit 5d83a73
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 21 deletions.
4 changes: 2 additions & 2 deletions roles/edpm_neutron_dhcp/tasks/bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@

- name: Ensure Openvswitch installed and running
ansible.builtin.include_role:
name: osp.edpm.edpm_ovn
tasks_from: "bootstrap.yml"
name: osp.edpm.edpm_ovs
tasks_from: "install.yml"
4 changes: 2 additions & 2 deletions roles/edpm_neutron_metadata/tasks/bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@

- name: Ensure Openvswitch installed and running
ansible.builtin.include_role:
name: osp.edpm.edpm_ovn
tasks_from: "bootstrap.yml"
name: osp.edpm.edpm_ovs
tasks_from: "install.yml"
4 changes: 2 additions & 2 deletions roles/edpm_neutron_ovn/tasks/bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@

- name: Ensure Openvswitch installed and running
ansible.builtin.include_role:
name: osp.edpm.edpm_ovn
tasks_from: "bootstrap.yml"
name: osp.edpm.edpm_ovs
tasks_from: "install.yml"
15 changes: 4 additions & 11 deletions roles/edpm_ovn/tasks/bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,7 @@
# License for the specific language governing permissions and limitations
# under the License.

- name: Ensure the Openvswitch package is installed
become: true
ansible.builtin.package:
name: openvswitch
state: present

- name: Ensure the OVS service is running
become: true
ansible.builtin.systemd:
name: openvswitch
state: started
- name: Ensure Openvswitch installed and running
ansible.builtin.include_role:
name: osp.edpm.edpm_ovs
tasks_from: "install.yml"
4 changes: 2 additions & 2 deletions roles/edpm_ovn_bgp_agent/tasks/configure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

- name: Ensure Openvswitch installed and running
ansible.builtin.include_role:
name: osp.edpm.edpm_ovn
tasks_from: "bootstrap.yml"
name: osp.edpm.edpm_ovs
tasks_from: "install.yml"

- name: Set cacert mount if present
block:
Expand Down
4 changes: 2 additions & 2 deletions roles/edpm_ovn_bgp_agent/tasks/configure_ovn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

- name: Ensure Openvswitch installed and running
ansible.builtin.include_role:
name: osp.edpm.edpm_ovn
tasks_from: "bootstrap.yml"
name: osp.edpm.edpm_ovs
tasks_from: "install.yml"

- name: Configure OVS external_ids
become: true
Expand Down

0 comments on commit 5d83a73

Please sign in to comment.