diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-13 16:08:38 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-13 16:08:38 +0200 |
| commit | 91ca434abb10aa14488a6bcd467c8228ea149752 (patch) | |
| tree | 3ab9e0446e663c18563ef57125b5aa2047c06b69 | |
| parent | 9b38e04de451a60da0bc8a685612282cd1b60ee6 (diff) | |
[reclass] noifupdown for cluster nodes PXE/admin
Instead of applying PXE/admin static IPs via Salt right away,
delay the transition from DHCP until after node reboot to avoid
duplicate IPs and networking issues during deployment.
Change-Id: I8a12d78a6b42edc9bcf9eb9ebc9590e2af5ec52c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
6 files changed, 6 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_biport.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_biport.yml.j2 index 4fa959797..cb4c233cd 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_biport.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_biport.yml.j2 @@ -28,6 +28,7 @@ parameters: gateway: {{ nm.net_admin_gw }} name_servers: - {{ nm.net_admin_gw }} + noifupdown: true single: enabled: true type: eth diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_triport.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_triport.yml.j2 index 05550a299..38a436138 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_triport.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_triport.yml.j2 @@ -27,6 +27,7 @@ parameters: name: ${_param:pxe_admin_interface} address: ${_param:pxe_admin_address} netmask: ${_param:opnfv_net_admin_mask} + noifupdown: true single_int: enabled: true type: eth diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2 index aebd88828..b6cba0ca9 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2 @@ -34,6 +34,7 @@ parameters: address: ${_param:pxe_admin_address} netmask: ${_param:opnfv_net_admin_mask} mtu: ${_param:interface_mtu} + noifupdown: true primary_interface: enabled: true name: ${_param:primary_interface} diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control_pdf.yml.j2 index b0b55afb9..503bbecb2 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control_pdf.yml.j2 @@ -18,6 +18,7 @@ parameters: type: eth address: ${_param:pxe_admin_address} netmask: ${_param:opnfv_net_admin_mask} + noifupdown: true single_int: enabled: true name: {{ nm.ctl01.nic_mgmt }} diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 index 4f22d4fa2..5b104429d 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 @@ -24,6 +24,7 @@ parameters: address: ${_param:pxe_admin_address} netmask: ${_param:opnfv_net_admin_mask} mtu: ${_param:interface_mtu} + noifupdown: true primary_interface: enabled: true name: ${_param:primary_interface} diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 index 5bb591765..bd7c91079 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 @@ -21,6 +21,7 @@ parameters: gateway: {{ nm.net_admin_gw }} name_servers: - {{ nm.net_admin_gw }} + noifupdown: true single_int: enabled: true name: {{ nm.ctl01.nic_mgmt }} |