From a289067ea6590eccdc1bac504f6bd98c9ae60ccd Mon Sep 17 00:00:00 2001
From: Brandon Mitchell <git@bmitch.net>
Date: Sun, 26 Jan 2020 14:18:09 -0500
Subject: [PATCH] Adding hostname, updating interface name

---
 base-centos-7-1905/user-data.tmpl  | 2 ++
 base-debian-10/network-config.tmpl | 2 +-
 base-debian-10/user-data.tmpl      | 3 +++
 base-debian-9/network-config.tmpl  | 2 +-
 base-debian-9/user-data.tmpl       | 2 ++
 base-ubuntu-bionic/user-data.tmpl  | 2 ++
 6 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/base-centos-7-1905/user-data.tmpl b/base-centos-7-1905/user-data.tmpl
index 08b3f7c..8ebf7c7 100644
--- a/base-centos-7-1905/user-data.tmpl
+++ b/base-centos-7-1905/user-data.tmpl
@@ -1,5 +1,7 @@
 #cloud-config
 users: [ $user_list ]
+hostname: ${name}
+manage_etc_hosts: true
 
 chpasswd: 
   list: |
diff --git a/base-debian-10/network-config.tmpl b/base-debian-10/network-config.tmpl
index 8a0d476..9052cc8 100644
--- a/base-debian-10/network-config.tmpl
+++ b/base-debian-10/network-config.tmpl
@@ -2,7 +2,7 @@
 version: 1
 config:
 - type: physical
-  name: enp1s0
+  name: enp0s1
 #  mac_address: INSTANCE_MAC_GOES_HERE
   subnets:
   - type: static
diff --git a/base-debian-10/user-data.tmpl b/base-debian-10/user-data.tmpl
index cf2fd5e..344ba45 100644
--- a/base-debian-10/user-data.tmpl
+++ b/base-debian-10/user-data.tmpl
@@ -1,4 +1,7 @@
 #cloud-config
+hostname: ${name}
+manage_etc_hosts: true
+
 users: [ ${user_list} ]
 
 chpasswd: 
diff --git a/base-debian-9/network-config.tmpl b/base-debian-9/network-config.tmpl
index d2ddd50..9052cc8 100644
--- a/base-debian-9/network-config.tmpl
+++ b/base-debian-9/network-config.tmpl
@@ -2,7 +2,7 @@
 version: 1
 config:
 - type: physical
-  name: eth0
+  name: enp0s1
 #  mac_address: INSTANCE_MAC_GOES_HERE
   subnets:
   - type: static
diff --git a/base-debian-9/user-data.tmpl b/base-debian-9/user-data.tmpl
index cf2fd5e..a290688 100644
--- a/base-debian-9/user-data.tmpl
+++ b/base-debian-9/user-data.tmpl
@@ -1,5 +1,7 @@
 #cloud-config
 users: [ ${user_list} ]
+hostname: ${name}
+manage_etc_hosts: true
 
 chpasswd: 
   list: |
diff --git a/base-ubuntu-bionic/user-data.tmpl b/base-ubuntu-bionic/user-data.tmpl
index a1f389a..41473ca 100644
--- a/base-ubuntu-bionic/user-data.tmpl
+++ b/base-ubuntu-bionic/user-data.tmpl
@@ -1,5 +1,7 @@
 #cloud-config
 users: [ ${user_list} ]
+hostname: ${name}
+manage_etc_hosts: true
 
 chpasswd: 
   list: |