Disk and naming fixes

* Remove extra disk on mon node(s)
* Rename manager instance to admin to be more consistent with documentation

compute.tf

@@ -22,10 +22,10 @@ data "template_file" "cloud_init_yml" {
   }
 }
 
-# manager node
+# admin node
 
-resource "openstack_compute_instance_v2" "mgr" {
-  name      = "mgr"
+resource "openstack_compute_instance_v2" "admin" {
+  name      = "admin"
   image_id  = data.openstack_images_image_v2.base_image.id
   flavor_id = data.openstack_compute_flavor_v2.m1_small.id
   key_pair  = var.ssh_keypair
@@ -50,9 +50,9 @@ resource "openstack_compute_instance_v2" "mgr" {
   }
 }
 
-resource "openstack_compute_floatingip_associate_v2" "mgr_association" {
+resource "openstack_compute_floatingip_associate_v2" "admin_association" {
   floating_ip = openstack_compute_floatingip_v2.floating_ip.address
-  instance_id = openstack_compute_instance_v2.mgr.id
+  instance_id = openstack_compute_instance_v2.admin.id
 }
 
 # OSD nodes
@@ -92,7 +92,8 @@ resource "openstack_compute_instance_v2" "osd" {
   }
 
   network {
-    uuid = openstack_networking_network_v2.public_network.id
+    uuid           = openstack_networking_network_v2.public_network.id
+    access_network = true
   }
 
   network {
@@ -153,15 +154,6 @@ resource "openstack_compute_instance_v2" "mon" {
     delete_on_termination = true
   }
 
-  block_device {
-    # and the volume to copy to
-    source_type           = "blank"
-    destination_type      = "volume"
-    volume_size           = 10
-    boot_index            = 1
-    delete_on_termination = true
-  }
-
   network {
     uuid = openstack_networking_network_v2.public_network.id
   }

networks.tf

@@ -14,6 +14,7 @@ resource "openstack_networking_network_v2" "cluster_network" {
 resource "openstack_networking_subnet_v2" "cluster_subnet" {
   network_id = openstack_networking_network_v2.cluster_network.id
   cidr       = "10.0.100.0/24"
+  no_gateway = true
 }
 
 # public network - management/filesystem network

outputs.tf

-output "manager_ip_address" {
+output "admin_ip_address" {
   value = openstack_compute_floatingip_v2.floating_ip.address
 }