cleanup

Author: PhilipDeegan

data__openstack_blockstorage_volume_v3.tf

@@ -1,4 +1,4 @@
 data openstack_images_image_v2 base_image {
   name        = var.BASE_IMAGE
   most_recent = true
-}
+}

data__openstack_images_image_v2.tf

@@ -2,14 +2,8 @@ data openstack_networking_network_v2 private {
   name = local.INSTANCE_NETWORK
 }
 
-#data "openstack_networking_network_v2" "intra_network" {
-#  name = "jup-ng-staging"
-#}
 
 data "openstack_networking_subnet_ids_v2" "intra_subnets" {
   network_id = openstack_networking_network_v2.intra_network.id
 }
 
-#data "openstack_networking_subnet_v2" "intra_subnet" {
-#  network_id = openstack_networking_network_v2.intra_network.id
-#}

data__openstack_networking_floatingip_v2.tf

@@ -6,7 +6,6 @@ resource openstack_blockstorage_volume_v3 persistent-volumes {
 
 resource openstack_networking_floatingip_v2 instance {
   pool = "public-2"
-  #subnet_ids = data.openstack_networking_subnet_ids_v2.intra_subnets.ids
 }
 
 resource openstack_compute_instance_v2 instance {
@@ -20,13 +19,6 @@ resource openstack_compute_instance_v2 instance {
     port     = openstack_networking_port_v2.instance.id
   }
 
-  #user_data = templatefile("${path.module}/user_data.tmpl", {
-  #  fqdn = local.INSTANCE_FQDN
-  #  timezone = local.TIMEZONE
-  #  ntp_servers = local.NTP_SERVERS
-  #  ssh_authorized_keys = data.external.ssh_authorized_keys.result
-  #  ssh_host_keys = data.external.ssh_host_keys.result
-  #})
   connection {
     type = "ssh"
     agent = true
@@ -36,15 +28,6 @@ resource openstack_compute_instance_v2 instance {
   provisioner remote-exec {
     inline = [ "hostname" ]
   }
-  #provisioner "local-exec" {
-  #  environment = {
-  #    REMOTE_USER = var.REMOTE_USER
-  #    REMOTE_FQDN = openstack_networking_floatingip_v2.instance.address
-  #  }
-  #  working_dir = dirname(abspath(path.root))
-  #  command = "pwd && task provisioner:install"
-  #
-  #}
 
 }
 

data__openstack_networking_network_v2.tf

@@ -1,5 +1,6 @@
+
 resource openstack_compute_volume_attach_v2 persistent-volumes {
   for_each    = openstack_blockstorage_volume_v3.persistent-volumes
   instance_id = openstack_compute_instance_v2.instance.id
   volume_id   = each.value.id
-}
+}

resources__openstack_compute_instance_v2.tf

@@ -3,4 +3,4 @@
 resource openstack_networking_floatingip_associate_v2 instance {
   floating_ip = openstack_networking_floatingip_v2.instance.address
   port_id     = openstack_networking_port_v2.instance.id
-}
+}