From 26b4310a3f25c8eb91ffdd46bf85ad819435a8e2 Mon Sep 17 00:00:00 2001
From: David Galloway <dgallowa@redhat.com>
Date: Thu, 1 Dec 2016 15:26:24 -0500
Subject: [PATCH] cobbler: Remove cephlab_ubuntu_network snippet

Just cruft at this point.  It hasn't been used since
05267fe001432d326c30262d4b07d1775a2ad0d4

Signed-off-by: David Galloway <dgallowa@redhat.com>
---
 roles/cobbler/defaults/main.yml               |  1 -
 .../templates/snippets/cephlab_ubuntu_network | 44 -------------------
 2 files changed, 45 deletions(-)
 delete mode 100644 roles/cobbler/templates/snippets/cephlab_ubuntu_network

diff --git a/roles/cobbler/defaults/main.yml b/roles/cobbler/defaults/main.yml
index 8af4005e..0acf7c90 100644
--- a/roles/cobbler/defaults/main.yml
+++ b/roles/cobbler/defaults/main.yml
@@ -40,7 +40,6 @@ snippets:
   - cephlab_rc_local
   - cephlab_rhel_disks
   - cephlab_post_install_kernel_options
-  - cephlab_ubuntu_network
 
 scripts:
   - cephlab_preseed_late
diff --git a/roles/cobbler/templates/snippets/cephlab_ubuntu_network b/roles/cobbler/templates/snippets/cephlab_ubuntu_network
deleted file mode 100644
index 6c8f4845..00000000
--- a/roles/cobbler/templates/snippets/cephlab_ubuntu_network
+++ /dev/null
@@ -1,44 +0,0 @@
-### {{ ansible_managed }}
-#set os_version = $getVar('os_version','')
-#if $os_version == 'vivid'
-# deleting interfaces we don't need for vivid.
-# if these are in place then vivid wants to use eth2 as the
-# primary interface
-sed -i '/eth2/d' /etc/udev/rules.d/70-persistent-net.rules
-sed -i '/eth3/d' /etc/udev/rules.d/70-persistent-net.rules
-#end if
-
-rm -f /etc/network/interfaces
-touch /etc/network/interfaces
-
-cat >> /etc/network/interfaces << EOF
-# This file describes the network interfaces available on your system
-# and how to activate them. For more information, see interfaces(5).
-
-# The loopback network interface
-auto lo
-iface lo inet loopback
-
-# The primary network interface
-auto eth0
-iface eth0 inet dhcp
-# This is an autoconfigured IPv6 interface
-iface eth0 inet6 auto
-EOF
-
-{% if resolvconf|length > 0 %}
-rm -f /etc/resolv.conf
-touch /etc/resolv.conf
-
-cat >> /etc/resolv.conf << EOF
-{% for line in resolvconf %}
-{{ line }}
-{% endfor %}
-EOF
-
-cat >> /etc/resolvconf/resolv.conf.d/base << EOF
-{% for line in resolvconf %}
-{{ line }}
-{% endfor %}
-EOF
-{% endif %}
-- 
2.47.3