Rename new DHCP servers and rename module

The old DHCP servers are gone, so these don't need to be disambiguated
anymore.

Author: mjm

macstadium-prod-1/dhcp.tf

@@ -1,5 +1,5 @@
 module "dhcp_server" {
-  source                        = "../modules/macstadium_dhcp_server_2"
+  source                        = "../modules/macstadium_dhcp_server"
   index                         = 1
   datacenter                    = "pod-1"
   cluster                       = "MacPro_Pod_1"

macstadium-prod-2/dhcp.tf

@@ -1,5 +1,5 @@
 module "dhcp_server" {
-  source                        = "../modules/macstadium_dhcp_server_2"
+  source                        = "../modules/macstadium_dhcp_server"
   index                         = 2
   datacenter                    = "pod-2"
   cluster                       = "MacPro_Pod_2"

modules/macstadium_dhcp_server_2/dhcp-server.tf renamed to modules/macstadium_dhcp_server/dhcp-server.tf

@@ -29,7 +29,7 @@ data "template_file" "dhcpd_conf" {
 }
 
 resource "vsphere_virtual_machine" "dhcp_server" {
-  name             = "new-dhcp-server-${var.index}"
+  name             = "dhcp-server-${var.index}"
   folder           = "Internal VMs"
   resource_pool_id = "${data.vsphere_compute_cluster.cluster.resource_pool_id}"
   datastore_id     = "${data.vsphere_datastore.datastore.id}"