Skip to content

Commit

Permalink
Use edpm_ovs role for ovs installation
Browse files Browse the repository at this point in the history
Currently each depending role has his own version of
ovs installation with hardcoded package name, this leads
to ovs upgrade during adoption and cause network downtime.
Reusing edpm_ovs role for ovs installation to avoid
the issue as it has option to override rpm name and
override is used during adoption to avoid ovs upgrade.

Related-Issue: OSPRH-10283
  • Loading branch information
karelyatin committed Sep 27, 2024
1 parent 975ad1e commit 9a3a932
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 9a3a932

Please sign in to comment.