CORD-463 - only set gateway in interface file if requested
Change-Id: I1f38f85b8fbf3c54ca444d0cf0d243c1fd53a5b8
diff --git a/library/netfile.py b/library/netfile.py
index fdf8888..98463df 100755
--- a/library/netfile.py
+++ b/library/netfile.py
@@ -190,7 +190,6 @@
values["network"] = addr.network_address.exploded.encode('ascii','ignore')
values["netmask"] = addr.netmask.exploded.encode('ascii','ignore')
values["broadcast"] = addr.broadcast_address.exploded.encode('ascii','ignore')
- values["gateway"] = addr.hosts().next().exploded.encode('ascii','ignore')
else:
values["address"] = value
elif key[0] != '_':
diff --git a/roles/compute-node/tasks/networking.yml b/roles/compute-node/tasks/networking.yml
index e15170d..7586728 100644
--- a/roles/compute-node/tasks/networking.yml
+++ b/roles/compute-node/tasks/networking.yml
@@ -33,19 +33,19 @@
when: netinfo[item]['module'] is defined and search_list.find('|' + netinfo[item]['module'] + '|') == -1 and ( not compute_node.interfaces.external or item != compute_node.interfaces.external )
changed_when: false
-#- name: Ensure Loopback
-# netfile:
-# src: "{{ compute_node.interfaces.file }}"
-# state: present
-# name: lo
-# config: loopback
-# auto: true
-# description: "Loopback interface"
-# register: net_changed
+- name: Ensure Loopback
+ netfile:
+ src: "{{ compute_node.interfaces.file }}"
+ state: present
+ name: lo
+ config: loopback
+ auto: true
+ description: "Loopback interface"
+ register: net_changed
-#- name: Verify Loopback Change
-# set_fact:
-# reboot_required: "{{ net_changed.changed }}"
+- name: Verify Loopback Change
+ set_fact:
+ reboot_required: "{{ net_changed.changed }}"
- name: Ensure Fabric
netfile:
@@ -63,7 +63,7 @@
- name: Verify Network Change
set_fact:
- reboot_required: "{{ reboot_required }}"
+ reboot_required: "{{ reboot_required }} or {{ net_changed.changed }}"
- name: Gather Primary Fabric Interface
set_fact: