Revert "added keypair module also"

This reverts commit cba6f07.

openstack/main.tf

@@ -1,8 +1,8 @@
 # Cluster settings
 variable cluster_prefix {}
 variable KuberNow_image {}
-variable ssh_key {}
-variable external_network_uuid{}
+variable keypair_name {}
+variable private_network {}
 variable kubeadm_token {}
 
 # Master settings
@@ -17,28 +17,13 @@ variable node_flavor {}
 variable edge_count {}
 variable edge_flavor {}
 
-# Upload ssh-key to be used for access to the nodes
-module "keypair" {
-  source = "./keypair"
-  public_key = "${var.ssh_key}"
-  name_prefix = "${var.cluster_prefix}"
-}
-
-# Create a network (and security group) with an externally attached router
-module "network" {
-  source = "./network"
-  external_net_uuid = "${var.external_network_uuid}"
-  name_prefix = "${var.cluster_prefix}"
-}
-
 module "master" {
   source = "./master"
   name_prefix = "${var.cluster_prefix}"
   image_name = "${var.KuberNow_image}"
   flavor_name = "${var.master_flavor}"
-  keypair_name = "${module.keypair.keypair_name}"
-  network_name = "${module.network.network_name}"
-  secgroup_name = "${module.network.secgroup_name}"
+  keypair_name = "${var.keypair_name}"
+  network_name = "${var.private_network}"
   floating_ip_pool = "${var.floating_ip_pool}"
   kubeadm_token = "${var.kubeadm_token}"
 }
@@ -48,9 +33,8 @@ module "node" {
   name_prefix = "${var.cluster_prefix}"
   image_name = "${var.KuberNow_image}"
   flavor_name = "${var.node_flavor}"
-  keypair_name = "${module.keypair.keypair_name}"
-  network_name = "${module.network.network_name}"
-  secgroup_name = "${module.network.secgroup_name}"
+  keypair_name = "${var.keypair_name}"
+  network_name = "${var.private_network}"
   kubeadm_token = "${var.kubeadm_token}"
   master_ip = "${module.master.ip_address}"
   count = "${var.node_count}"
@@ -61,9 +45,8 @@ module "edge" {
   name_prefix = "${var.cluster_prefix}"
   image_name = "${var.KuberNow_image}"
   flavor_name = "${var.edge_flavor}"
-  keypair_name = "${module.keypair.keypair_name}"
-  network_name = "${module.network.network_name}"
-  secgroup_name = "${module.network.secgroup_name}"
+  keypair_name = "${var.keypair_name}"
+  network_name = "${var.private_network}"
   kubeadm_token = "${var.kubeadm_token}"
   floating_ip_pool = "${var.floating_ip_pool}"
   master_ip = "${module.master.ip_address}"

terraform.tfvars.os-template

@@ -1,10 +1,10 @@
 # Cluster configuration
 cluster_prefix = "KubeNow" # Your cluster prefix
 KuberNow_image = "KubeNow" # Name of the image created with Packer
-ssh_key = "~/.ssh/id_rsa.pub" # Path to your public SSH key to be used for ssh node access
+keypair_name = "my-keypair" # Name of the keypair in OpenStack project (for ssh node access)
+private_network = "my_internal_net_name" # Name of the network to fire up the instances on
 kubeadm_token = "your-kubeadm-token" # You can run generate_kubetoken.sh to create a valid token
 floating_ip_pool = "your-pool-name"
-external_network_uuid = "external-net-uuid" # The uuid of the external network in the OpenStack tenancy
 
 # Master configuration
 # obs: too small flavors might cause diffuse errors on your installation