Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deploy-bm-hypervisor added generic secondary network config #33

Merged
merged 1 commit into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 53 additions & 28 deletions playbooks/infra/deploy-bm-hypervisor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,15 @@
location: rdu
system_iso_link: "{{ system_iso_rdu_link if location == 'rdu' else system_iso_tlv_link }}"
tasks:

# Requirements of redhatci.ocp.setup_http_store role
- name: Ensure firewalld is running
become: true
ansible.builtin.service:
name: firewalld
enabled: true
state: started

- name: Set ISO name
ansible.builtin.set_fact:
iso_name: installation.iso
Expand Down Expand Up @@ -186,7 +195,6 @@
dns4:
- "{{ (net_config | from_yaml)['dns'] }}"


- name: Set up network connection bridge-slave
community.general.nmcli:
type: ethernet
Expand All @@ -209,33 +217,50 @@
- name: Gather facts
ansible.builtin.gather_facts:

- name: Configure secondary interface bridges
when: item.value.ifname in ansible_facts.interfaces
loop: "{{ seconday_networks | from_yaml | dict2items }}"
community.general.nmcli:
type: bridge
conn_name: "{{ item.key }}"
method4: manual
method6: disabled
state: present
stp: false
ifname: "{{ item.key }}"
autoconnect: true
ip4: "{{ item.value.ipv4 }}"

- name: Configure vlan interfaces
when: item.value.ifname in ansible_facts.interfaces
loop: "{{ seconday_networks | from_yaml | dict2items }}"
community.general.nmcli:
type: vlan
conn_name: "vlan{{ item.value.vlan }}"
state: present
ifname: "vlan{{ item.value.vlan }}"
autoconnect: true
slave_type: bridge
vlanid: "{{ item.value.vlan }}"
master: "{{ item.key }}"
vlandev: "{{ item.value.ifname }}"
- name: Configure secondary interfaces if required
when: seconday_networks is defined
block:

- name: Configure secondary interface bridges
when: item.value.ifname in ansible_facts.interfaces
loop: "{{ seconday_networks | from_yaml | dict2items }}"
community.general.nmcli:
type: bridge
conn_name: "{{ item.key }}"
method4: manual
method6: disabled
state: present
stp: false
ifname: "{{ item.key }}"
autoconnect: true
ip4: "{{ item.value.ipv4 }}"

- name: Set up network connection bridge-slave for secondary connection
when: item.value.vlan is not defined
loop: "{{ seconday_networks | from_yaml | dict2items }}"
community.general.nmcli:
type: ethernet
slave_type: bridge
ifname: "{{ item.value.ifname }}"
master: "{{ item.key }}"
method4: disabled
conn_name: "{{ item.value.ifname }}"
state: present
autoconnect: true

- name: Configure vlan interfaces for secondary connection
when: item.value.ifname in ansible_facts.interfaces and item.value.vlan is defined
loop: "{{ seconday_networks | from_yaml | dict2items }}"
community.general.nmcli:
type: vlan
conn_name: "vlan{{ item.value.vlan }}"
state: present
ifname: "vlan{{ item.value.vlan }}"
autoconnect: true
slave_type: bridge
vlanid: "{{ item.value.vlan }}"
master: "{{ item.key }}"
vlandev: "{{ item.value.ifname }}"

- name: Install virtualization packages
ansible.builtin.dnf:
Expand Down
8 changes: 8 additions & 0 deletions playbooks/infra/roles/kickstart_iso/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,15 @@
changed_when: true
notify: Remove working directory

- name: Ensure destionation directory exists
become: true
ansible.builtin.file:
state: directory
path: "{{ kickstart_iso_file_desire_location }}"
mode: "0755"

- name: Move iso file to required directory
become: true
ansible.builtin.copy:
src: "{{ kickstart_iso_dest_dir }}/{{ kickstart_iso_name }}"
dest: "{{ kickstart_iso_file_desire_location }}/{{ kickstart_iso_name }}"
Expand Down
Loading