starlingx/ansible-playbooks
Code Issues Proposed changes

Removing unnecessary IP for platform-nfs.

Browse Source 
It is not necessary to allocate a specific IP address
for NFS.
Creating the alias controller-platform-nfs for floating-
controller IP address is enough.
With this change, another IP address is available to
configure an additional Worker node.
( i.e: subnet /29 )

Story: 2010351
Task: 46502

Test plan ( Debian only )
PASS Installed 2+2 system with subnet configuration (/29)
     (2controllers, 2 workers)
PASS Installed 2+2 system using IPv6 subnet

Signed-off-by: Fabiano Mercer <fabiano.correamercer@windriver.com>
Change-Id: I30d4e13f58b544cd75d77ea66a156a7d4efbb88e
This commit is contained in:
Fabiano Mercer
2022-09-29 21:04:17 -03:00
committed by Fabiano Correa Mercer
parent e987b74f7d
commit 4e483590ea
4 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/main.yml
View File

@@ -23,8 +23,6 @@
- ip addr add {{ mgmt_virtual }} brd {{ management_broadcast }} dev lo scope host label lo:1
- ip addr add {{ pxe_virtual }} dev lo scope host
- ip addr add {{ cluster_floating_virtual }} dev lo scope host
- ip addr add {{ mgmt_nfs_1_virtual }} dev lo scope host
- ip addr add {{ mgmt_nfs_2_virtual }} dev lo scope host
- name: Fail if adding interface addresses failed for reason other than it has been done before
fail:

4
playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/refresh_local_dns.yml
View File

@@ -31,15 +31,13 @@
line: "{{ item }}"
create: yes
with_items:
- "{{ controller_floating_address }}\tcontroller"
- "{{ controller_floating_address }}\tcontroller controller-platform-nfs"
# May not need this entry
- "{{ controller_0_cluster_host }}\tcontroller-0-infra"
- "{{ controller_pxeboot_floating_address }}\tpxecontroller"
- "{{ external_oam_floating_address }}\toamcontroller"
- "{{ derived_network_params.nfs_management_address_1 }}\tcontroller-platform-nfs"
# May not need this entry
- "{{ controller_1_cluster_host }}\tcontroller-1-infra"
- "{{ derived_network_params.nfs_management_address_2 }}\tcontroller-nfs"
- block:
- name: Set central registry for subcloud

4
playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/shutdown_services.yml
View File

@@ -95,8 +95,6 @@
- name: Set facts for the removal of addresses assigned to loopback interface
set_fact:
prev_mgmt_nfs_1_virtual: "{{ prev_controller_floating_address|ipmath(3) }}/{{ prev_management_subnet_prefix }}"
prev_mgmt_nfs_2_virtual: "{{ prev_controller_floating_address|ipmath(4) }}/{{ prev_management_subnet_prefix }}"
prev_mgmt_floating_virtual: "{{ prev_controller_floating_address }}/{{ prev_management_subnet_prefix }}"
prev_cluster_floating_virtual: "{{ prev_cluster_floating_address }}/{{ prev_cluster_subnet_prefix }}"
prev_pxe_virtual: "{{ prev_controller_pxeboot_floating_address }}/{{ prev_pxe_subnet_prefix }}"
@@ -112,8 +110,6 @@
failed_when: false
with_items:
- source /etc/platform/openrc; system host-if-delete controller-0 lo
- "ip addr delete {{ prev_mgmt_nfs_2_virtual }} dev lo scope host"
- "ip addr delete {{ prev_mgmt_nfs_1_virtual }} dev lo scope host"
- "ip addr delete {{ prev_cluster_floating_virtual }} dev lo scope host"
- "ip addr delete {{ prev_pxe_virtual }} dev lo scope host"
- "ip addr delete {{ prev_mgmt_virtual }} brd {{ management_broadcast }} dev lo:1 scope host"

4
playbookconfig/src/playbooks/roles/bootstrap/validate-config/tasks/main.yml
View File

@@ -399,8 +399,6 @@
'management_interface_name': lo
'controller_0_address': "{{ controller_floating_address|ipmath(1) }}"
'controller_1_address': "{{ controller_floating_address|ipmath(2) }}"
'nfs_management_address_1': "{{ controller_floating_address|ipmath(3) }}"
'nfs_management_address_2': "{{ controller_floating_address|ipmath(4) }}"
'controller_pxeboot_address_0': "{{ controller_pxeboot_floating_address|ipmath(1) }}"
'controller_pxeboot_address_1': "{{ controller_pxeboot_floating_address|ipmath(2) }}"
@@ -429,8 +427,6 @@
pxe_virtual: "{{ controller_pxeboot_floating_address }}/{{ pxe_subnet_prefix }}"
cluster_floating_virtual: "{{ cluster_floating_address }}/{{ cluster_subnet_prefix }}"
mgmt_floating_virtual: "{{ controller_floating_address }}/{{ management_subnet_prefix }}"
mgmt_nfs_1_virtual: "{{ derived_network_params.nfs_management_address_1 }}/{{ management_subnet_prefix }}"
mgmt_nfs_2_virtual: "{{ derived_network_params.nfs_management_address_2 }}/{{ management_subnet_prefix }}"
# Docker config validation
- block: