From fe1c929e1f722a4eca0a9f98c4429a8ee33aac15 Mon Sep 17 00:00:00 2001
From: Tristan Zhang <tristan.zhang@ormuco.com>
Date: Wed, 24 Jun 2020 04:17:42 +0000
Subject: [PATCH] Fix a bug that skips Computing new DHCP range
---
playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml b/playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml
index 2be3f22f..60f64630 100644
--- a/playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml
+++ b/playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml
@@ -254,7 +254,7 @@
set_fact:
dhcp_start_ip: "{{ dhcp_pool_start.split('.')[-1] }}"
dhcp_end_ip: "{{ dhcp_pool_end.split('.')[-1] }}"
- dhcp_netaddr: "{{ itf_netaddr1 | ipaddr('network') }}"
+ dhcp_new_netaddr: "{{ itf_netaddr1 | ipaddr('network') }}"
when:
- include_dhcp_server | bool == true
- itf_netaddr2 | ipaddr('network') != dhcp_netaddr | ipaddr('network')
@@ -263,8 +263,8 @@
# the new network depending on netmasks and indexes.
- name: "Computing new DHCP range"
set_fact:
- dhcp_pool_start: "{{ '.'.join(dhcp_netaddr.split('.')[0:-1]) }}.{{ dhcp_start_ip }}"
- dhcp_pool_end: "{{ '.'.join(dhcp_netaddr.split('.')[0:-1]) }}.{{ dhcp_end_ip }}"
+ dhcp_pool_start: "{{ '.'.join(dhcp_new_netaddr.split('.')[0:-1]) }}.{{ dhcp_start_ip }}"
+ dhcp_pool_end: "{{ '.'.join(dhcp_new_netaddr.split('.')[0:-1]) }}.{{ dhcp_end_ip }}"
when:
- include_dhcp_server | bool == true
- itf_netaddr2 | ipaddr('network') != dhcp_netaddr | ipaddr('network')
--
GitLab