forked from openshift-kni/baremetal-deploy
-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
115 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 12 additions & 7 deletions
19
ansible-ipi-install/roles/bootstrap/tasks/55_add_ocp_masters.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,20 @@ | ||
| - name: add masters to inventory file | ||
| add_host: | ||
| hostname: "master-{{ item }}" | ||
| name: master-{{ item }} | ||
| hostname: "master-{{ node_index }}" | ||
| name: master-{{ node_index }} | ||
| groups: masters | ||
| role: master | ||
| ipmi_user: "{{ lab_ipmi_user }}" | ||
| ipmi_password: "{{ lab_ipmi_password }}" | ||
| ipmi_address: "{{ master_mgmts[item | int] }}" | ||
| ipmi_user: "{{ node_item.pm_user }}" | ||
| ipmi_password: "{{ node_item.pm_password }}" | ||
| ipmi_address: "{{ node_item.pm_addr }}" | ||
| ipmi_port: 623 | ||
| provision_mac: "{{ master_prov_macs[item | int] }}" | ||
| provision_mac: "{{ node_item.prov_mac }}" | ||
| provision_nic: "{{ node_item.prov_nic }}" | ||
| baremetal_nic: "{{ node_item.bm_nic }}" | ||
| hardware_profile: "default" | ||
| poweroff: true | ||
| with_sequence: start=0 end=2 | ||
| loop: "{{ deploying_master_nodes_content }}" | ||
| loop_control: | ||
| index_var: node_index | ||
| loop_var: node_item | ||
|
|
19 changes: 12 additions & 7 deletions
19
ansible-ipi-install/roles/bootstrap/tasks/60_add_ocp_workers.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,19 @@ | ||
| - name: add workers to inventory file | ||
| add_host: | ||
| hostname: worker-{{ item }} | ||
| name: worker-{{ item }} | ||
| hostname: worker-{{ node_index }} | ||
| name: worker-{{ node_index }} | ||
| groups: workers | ||
| role: worker | ||
| ipmi_user: "{{ lab_ipmi_user }}" | ||
| ipmi_password: "{{ lab_ipmi_password }}" | ||
| ipmi_address: "{{ worker_mgmts[item | int] }}" | ||
| ipmi_user: "{{ node_item.pm_user }}" | ||
| ipmi_password: "{{ node_item.pm_password }}" | ||
| ipmi_address: "{{ node_item.pm_addr }}" | ||
| ipmi_port: 623 | ||
| provision_mac: "{{ worker_prov_macs[item | int] }}" | ||
| provision_mac: "{{ node_item.prov_mac }}" | ||
| provision_nic: "{{ node_item.prov_nic }}" | ||
| baremetal_nic: "{{ node_item.bm_nic }}" | ||
| hardware_profile: "unknown" | ||
| poweroff: true | ||
| with_sequence: start=0 end={{ worker_mgmts | length - 1 if worker_mgmts|length > 0 }} | ||
| loop: "{{ deploying_worker_nodes_content }}" | ||
| loop_control: | ||
| index_var: node_index | ||
| loop_var: node_item |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
ansible-ipi-install/roles/shared-labs-prep/templates/ocp4-lab.nmstate.conf.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| interfaces: | ||
| {% for nic in disable_nics %} | ||
| - name: {{ nic }} | ||
| state: down | ||
| ipv4: | ||
| enabled: false | ||
| ipv6: | ||
| enabled: false | ||
| {% endfor %} | ||
| {% raw -%} | ||
| - name: {{ provision_nic }} | ||
| state: up | ||
| type: ethernet | ||
| ipv4: | ||
| enabled: true | ||
| dhcp: true | ||
| auto-dns: true | ||
| auto-gateway: true | ||
| auto-routes: true | ||
| ipv6: | ||
| enabled: true | ||
| autoconf: false | ||
| dhcp: false | ||
| - name: {{ baremetal_nic }} | ||
| state: up | ||
| type: ethernet | ||
| ipv4: | ||
| enabled: true | ||
| dhcp: true | ||
| auto-dns: true | ||
| auto-gateway: true | ||
| auto-routes: true | ||
| ipv6: | ||
| enabled: true | ||
| autoconf: false | ||
| dhcp: false | ||
| {% endraw %} |
2 changes: 1 addition & 1 deletion
2
ansible-ipi-install/roles/shared-labs-prep/templates/ocp4-lab.udev-pubnics.rules.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| {% for nic in disable_nics %} | ||
| ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="{{ nic }}", RUN+="/bin/sh -c 'echo 1 > /sys$DEVPATH/device/remove'" | ||
| ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="{{ nic }}", RUN+="/bin/sh -c 'echo 1 > /sys$env{DEVPATH}/device/remove'" | ||
| {% endfor %} |